Drop workarounds for Qt<6.9

Author: oskirby

CMakeLists.txt

@@ -163,13 +163,8 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten" AND
     )
 endif()
 
-if(QT_KNOWN_POLICY_QTP0001)
-    qt_policy(SET QTP0001 NEW)
-endif()
-
-if(QT_KNOWN_POLICY_QTP0004)
-    qt_policy(SET QTP0004 OLD)
-endif()
+qt_policy(SET QTP0001 NEW)
+qt_policy(SET QTP0004 OLD)
 
 message("Using Qt version ${Qt6_VERSION}")
 add_definitions(-DQT_DEPRECATED_WARNINGS)

src/CMakeLists.txt

@@ -11,6 +11,7 @@ mz_target_handle_warnings(mozillavpn)
 
 find_package(Qt6 REQUIRED COMPONENTS Svg)
 if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0)
+    set(QT_NO_PRIVATE_MODULE_WARNING ON)
     find_package(Qt6 REQUIRED COMPONENTS GuiPrivate QmlPrivate)
 endif()
 

src/cmake/android.cmake

@@ -67,12 +67,10 @@ set_property(TARGET mozillavpn PROPERTY QT_ANDROID_EXTRA_LIBS
     APPEND)
 
 
-if( ${Qt6_VERSION} VERSION_GREATER_EQUAL 6.4.0)
-    set_property(TARGET mozillavpn PROPERTY QT_ANDROID_EXTRA_LIBS
+set_property(TARGET mozillavpn APPEND PROPERTY
+    QT_ANDROID_EXTRA_LIBS
         ${OPENSSL_LIBS_DIR}/libcrypto_3.so
-        ${OPENSSL_LIBS_DIR}/libssl_3.so
-    APPEND)
-endif()
+        ${OPENSSL_LIBS_DIR}/libssl_3.so)
 
 option(MZ_ANDROID_FOSS_BUILD "Build apk without google play services" OFF)
 

src/cmake/linux.cmake

@@ -43,11 +43,8 @@ target_sources(mozillavpn PRIVATE
 )
 
 # Resolving the parent window handle for the XDG desktop portal on Wayland
-# needs the Gui internal header files on Qt 6.5.0 and later. Otherwise it
-# only works for X11.
-if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0)
-    target_link_libraries(mozillavpn PRIVATE Qt6::GuiPrivate)
-endif()
+# needs the Gui internal header files on Qt 6.5.0 and later.
+target_link_libraries(mozillavpn PRIVATE Qt6::GuiPrivate)
 
 if(NOT BUILD_FLATPAK)
     # Link to polkit

src/commands/commandui.cpp

@@ -246,12 +246,6 @@ int CommandUI::run(QStringList& tokens) {
     vpn->initialize();
     logger.debug() << "VPN initialized";
 
-    // Prior to Qt 6.5, there was no default QML import path. We must set one.
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
-    engine->addImportPath("qrc:/");
-    engine->addImportPath("qrc:/qt/qml");
-    logger.debug() << "Added QML import paths";
-#endif
     QQuickImageProvider* provider = ImageProviderFactory::create(qApp);
     if (provider) {
       engine->addImageProvider(QString("app"), provider);
@@ -268,13 +262,8 @@ int CommandUI::run(QStringList& tokens) {
                                  I18nStrings::instance());
     logger.debug() << "Registered I18nStrings";
 
-#if MZ_IOS && QT_VERSION < 0x060300
-    QObject::connect(qApp, &QCoreApplication::aboutToQuit, vpn,
-                     &MozillaVPN::quit);
-#else
     QObject::connect(qApp, &QCoreApplication::aboutToQuit, vpn,
                      [] { MozillaVPN::instance()->aboutToQuit(); });
-#endif
 
     QObject::connect(
         qApp, &QGuiApplication::commitDataRequest, vpn,

src/mozillavpn.cpp

@@ -148,15 +148,6 @@ void MozillaVPN::quit() {
   logger.debug() << "quit";
   TaskScheduler::forceDeleteTasks();
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 2, 4)
-  // Qt5Compat.GraphicalEffects makes the app crash on shutdown. Let's do a
-  // quick exit. See: https://bugreports.qt.io/browse/QTBUG-100687
-  // it is unknown when exactly this was fixed but apparently 6.2.4 is fine.
-
-  SettingsManager::instance()->sync();
-  exit(0);
-#endif
-
   qApp->quit();
 }
 

src/networkrequest.cpp

@@ -211,37 +211,6 @@ void NetworkRequest::replyFinished() {
     return;
   }
 
-#if QT_VERSION < 0x060400
-  if (m_reply->error() == QNetworkReply::HostNotFoundError && isRedirect()) {
-    QUrl brokenUrl = m_reply->url();
-
-    if (brokenUrl.host().isEmpty() && !m_redirectedUrl.isEmpty()) {
-      QUrl url = m_redirectedUrl.resolved(brokenUrl);
-
-#  ifdef MZ_DEBUG
-      // See https://bugreports.qt.io/browse/QTBUG-100651
-      logger.debug()
-          << "QT6 redirect bug! The current URL is broken because it's not "
-             "resolved using the latest HTTP redirection as base-URL";
-      logger.debug() << "Broken URL:" << brokenUrl.toString();
-      logger.debug() << "Latest redirected URL:" << m_redirectedUrl.toString();
-      logger.debug() << "Final URL:" << url.toString();
-#  endif
-
-      m_request = QNetworkRequest(url);
-      m_request.setHeader(QNetworkRequest::ContentTypeHeader,
-                          "application/json");
-      m_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute,
-                             QNetworkRequest::NoLessSafeRedirectPolicy);
-
-      m_reply = nullptr;
-      m_timer.stop();
-      getResource();
-      return;
-    }
-  }
-#endif
-
   int status = statusCode();
   logger.debug() << "Network reply received - status:" << status
                  << "- expected:" << expectStatusString();
@@ -332,29 +301,7 @@ void NetworkRequest::handleHeaderReceived() {
 }
 
 void NetworkRequest::handleRedirect(const QUrl& redirectUrl) {
-#if QT_VERSION < 0x060400
-  if (redirectUrl.host().isEmpty()) {
-#  ifdef MZ_DEBUG
-    // See https://bugreports.qt.io/browse/QTBUG-100651
-    logger.debug()
-        << "QT6 redirect bug! The redirected URL is broken because it's not "
-           "resolved using the previous HTTP redirection as base-URL";
-    logger.debug() << "Broken URL:" << redirectUrl.toString();
-    logger.debug() << "Latest redirected URL:" << m_redirectedUrl.toString();
-#  endif
-
-    if (m_redirectedUrl.isEmpty()) {
-      m_redirectedUrl = url().resolved(redirectUrl);
-    } else {
-      m_redirectedUrl = m_redirectedUrl.resolved(redirectUrl);
-    }
-  } else {
-    m_redirectedUrl = redirectUrl;
-  }
-  emit requestRedirected(this, m_redirectedUrl);
-#else
   emit requestRedirected(this, redirectUrl);
-#endif
 }
 
 void NetworkRequest::timeout() {

src/networkwatcher.cpp

@@ -91,12 +91,10 @@ void NetworkWatcher::initialize() {
     m_impl->start();
   }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
   // This call creates an instance of QNetworkInformation which can be used
   // later on to check other network related attributes such as network type, or
   // whether or not the network is behind captive portal.
   QNetworkInformation::loadDefaultBackend();
-#endif
 
   connect(settingsHolder, &SettingsHolder::unsecuredNetworkAlertChanged, this,
           &NetworkWatcher::settingsChanged);

src/platforms/linux/linuxutils.cpp

@@ -132,16 +132,5 @@ QString LinuxUtils::desktopFileId(const QString& path) {
   return path.mid(index).replace('/', '-');
 }
 
-// Workaround for QTBUG-108822 by manually registering QDBusObjectPath with the
-// D-Bus meta-type system, otherwise we are unable to connect to some signals.
-#if QT_VERSION < 0x060403
-class QtbugRegistrationProxy {
- public:
-  QtbugRegistrationProxy() { qDBusRegisterMetaType<QDBusObjectPath>(); }
-};
-
-static QtbugRegistrationProxy s_qtbugRegistrationProxy;
-#endif
-
 // Ensure that the D-Bus custom types are registered.
 static DBusMetatypeRegistrationProxy s_dbusMetatypeProxy;

src/platforms/linux/xdgportal.cpp

@@ -11,18 +11,9 @@
 #include <QProcessEnvironment>
 #include <QRandomGenerator>
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-#  include <private/qdesktopunixservices_p.h>
-#  include <private/qguiapplication_p.h>
-#  include <qpa/qplatformintegration.h>
-#elif QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-#  include <private/qgenericunixservices_p.h>
-#  include <private/qguiapplication_p.h>
-#  include <qpa/qplatformintegration.h>
-#else
-#  include <QGuiApplication>
-#  include <QWindow>
-#endif
+#include <private/qdesktopunixservices_p.h>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
 
 #include "dbustypes.h"
 #include "leakdetector.h"
@@ -116,24 +107,12 @@ QString XdgPortal::parentWindow() {
   if (!holder->hasWindow()) {
     return QString("");
   }
-#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+
   QDesktopUnixServices* services = dynamic_cast<QDesktopUnixServices*>(
       QGuiApplicationPrivate::platformIntegration()->services());
   if (services != nullptr) {
     return services->portalWindowIdentifier(holder->window());
   }
-#elif QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-  QGenericUnixServices* services = dynamic_cast<QGenericUnixServices*>(
-      QGuiApplicationPrivate::platformIntegration()->services());
-  if (services != nullptr) {
-    return services->portalWindowIdentifier(holder->window());
-  }
-#else
-  // X11 is the only platform that we can get a window handle on prior to 6.5.0
-  if (QGuiApplication::platformName() == "xcb") {
-    return "x11:" + QString::number(holder->window()->winId(), 16);
-  }
-#endif
 
   // Otherwise, we don't support this windowing system.
   return QString("");
@@ -251,14 +230,14 @@ void XdgPortal::setupAppScope(const QString& appId) {
   // Qt 6.8 introduced a bug where using QDBusConnection::sessionBus() before
   // QCoreApplication is created will silently break D-Bus signal connections.
   // To workaround this, spin up a separate, standalone bus for these steps.
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)) && \
-    (QT_VERSION < QT_VERSION_CHECK(6, 9, 2))
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 2)
   QString busName = QString("%1-appid-scope-helper").arg(appId);
   QDBusConnection bus =
       QDBusConnection::connectToBus(QDBusConnection::SessionBus, busName);
   auto guard =
       qScopeGuard([busName]() { QDBusConnection::disconnectFromBus(busName); });
 #else
+
   // If the XDG Registry portal exists, use it to advertise our application ID.
   // This is the right tool to use, but it's also very new.
   QDBusInterface xdgRegistry(XDG_PORTAL_SERVICE, XDG_PORTAL_PATH,