Remove obsolete QT_VERSION_CHECKs

Change-Id: Ib5a13476a0819b789326651aa3425a4ffebe93b1
Pick-to: 6.7
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>

4 files changed, 0 insertions, 21 deletions

diff --git a/src/manager-lib/packagemanager.cpp b/src/manager-lib/packagemanager.cpp
index 30731f83..6e5384f5 100644
--- a/src/manager-lib/packagemanager.cpp
+++ b/src/manager-lib/packagemanager.cpp
@@ -1541,13 +1541,8 @@ bool PackageManager::canceledPackageInstall(const QString &id)
 */
 int PackageManager::compareVersions(const QString &version1, const QString &version2)
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-    int vn1Suffix = -1;
-    int vn2Suffix = -1;
-#else
     qsizetype vn1Suffix = -1;
     qsizetype vn2Suffix = -1;
-#endif
     QVersionNumber vn1 = QVersionNumber::fromString(version1, &vn1Suffix);
     QVersionNumber vn2 = QVersionNumber::fromString(version2, &vn2Suffix);
 
diff --git a/src/shared-main-lib/sharedmain.cpp b/src/shared-main-lib/sharedmain.cpp
index 093f9731..fae04f8e 100644
--- a/src/shared-main-lib/sharedmain.cpp
+++ b/src/shared-main-lib/sharedmain.cpp
@@ -122,11 +122,7 @@ void SharedMain::setupQmlDebugging(bool qmlDebugging)
 
     if (hasJSDebugArg || qmlDebugging) {
 #if !defined(QT_NO_QML_DEBUGGER)
-#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-        static auto debuggingEnabler = std::make_unique<QQmlDebuggingEnabler>(true);
-#else
         QQmlDebuggingEnabler::enableDebugging(true);
-#endif
         if (!QLoggingCategory::defaultCategory()->isDebugEnabled()) {
             qCCritical(LogRuntime) << "The default 'debug' logging category was disabled. "
                                       "Re-enabling it for the QML Debugger interface to work correctly.";
diff --git a/src/window-lib/waylandcompositor.cpp b/src/window-lib/waylandcompositor.cpp
index 78d887f2..ead5ab12 100644
--- a/src/window-lib/waylandcompositor.cpp
+++ b/src/window-lib/waylandcompositor.cpp
@@ -108,11 +108,7 @@ void WindowSurface::close()
     if (m_topLevel) {
         m_topLevel->sendClose();
     } else if (m_popup) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-        QWaylandXdgPopupPrivate::get(m_popup)->send_popup_done();
-#else
         m_popup->sendPopupDone();
-#endif
     } else {
         qCWarning(LogGraphics) << "The Wayland surface" << this << "is not using the XDG Shell extension. Unable to send close signal.";
     }
diff --git a/src/window-lib/waylandwindow.cpp b/src/window-lib/waylandwindow.cpp
index af488f81..f0b6e818 100644
--- a/src/window-lib/waylandwindow.cpp
+++ b/src/window-lib/waylandwindow.cpp
@@ -29,11 +29,7 @@ WaylandWindow::WaylandWindow(Application *app, WindowSurface *surf)
         connect(surf, &WindowSurface::pong,
                 this, &WaylandWindow::pongReceived);
         connect(m_surface, &QWaylandSurface::hasContentChanged, this, &WaylandWindow::onContentStateChanged);
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
-        connect(m_surface, &QWaylandSurface::sizeChanged, this, &Window::sizeChanged);
-#else
         connect(m_surface, &QWaylandSurface::bufferSizeChanged, this, &Window::sizeChanged);
-#endif
 
         m_pingTimer->setInterval(1000);
         m_pingTimer->setSingleShot(true);
@@ -162,11 +158,7 @@ QString WaylandWindow::applicationId() const
 
 QSize WaylandWindow::size() const
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
-    return m_surface->size();
-#else
     return m_surface->bufferSize();
-#endif
 }
 
 void WaylandWindow::resize(const QSize &newSize)