QDesktopServices: clean up pre-Qt-6.6 code

Remove the code that was already commented out by
37a25fce94976ab2a0f94abe43f1ed6ad950672f for Qt versions ≥ 6.6.

Pick-to: 6.7
Change-Id: I40a3e974430add17b52307781d092bd4f58c0c35
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Juha Vuolle <[email protected]>
Reviewed-by: Thiago Macieira <[email protected]>
Reviewed-by: Mårten Nordheim <[email protected]>

2 files changed, 0 insertions, 48 deletions

diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 379d18dd60f..4d98faf3981 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -18,8 +18,6 @@
 #include <qpa/qplatformintegration.h>
 #include <qdir.h>
 
-#include <QtCore/private/qlocking_p.h>
-
 QT_BEGIN_NAMESPACE
 
 class QOpenUrlHandlerRegistry
@@ -36,36 +34,10 @@ public:
     };
     typedef QHash<QString, Handler> HandlerHash;
     HandlerHash handlers;
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-    QObject context;
-
-    void handlerDestroyed(QObject *handler);
-#endif
-
 };
 
 Q_GLOBAL_STATIC(QOpenUrlHandlerRegistry, handlerRegistry)
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
-{
-    const auto lock = qt_scoped_lock(mutex);
-    HandlerHash::Iterator it = handlers.begin();
-    while (it != handlers.end()) {
-        if (it->receiver == handler) {
-            it = handlers.erase(it);
-            qWarning("Please call QDesktopServices::unsetUrlHandler() before destroying a "
-                     "registered URL handler object.\n"
-                     "Support for destroying a registered URL handler object is deprecated, "
-                     "and will be removed in Qt 6.6.");
-        } else {
-            ++it;
-        }
-    }
-}
-#endif
-
 /*!
     \class QDesktopServices
     \brief The QDesktopServices class provides methods for accessing common desktop services.
@@ -307,11 +279,6 @@ void QDesktopServices::setUrlHandler(const QString &scheme, QObject *receiver, c
     h.receiver = receiver;
     h.name = method;
     registry->handlers.insert(scheme.toLower(), h);
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-    QObject::connect(receiver, &QObject::destroyed, &registry->context,
-                     [registry](QObject *obj) { registry->handlerDestroyed(obj); },
-                     Qt::DirectConnection);
-#endif
 }
 
 /*!
diff --git a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
index e08b299209f..e75626eda73 100644
--- a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
+++ b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
@@ -42,10 +42,6 @@ public slots:
     }
 };
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-# define CAN_IMPLICITLY_UNSET
-#endif
-
 void tst_qdesktopservices::handlers()
 {
     MyUrlHandler fooHandler;
@@ -53,12 +49,10 @@ void tst_qdesktopservices::handlers()
 
     QDesktopServices::setUrlHandler(QString("foo"), &fooHandler, "handle");
     QDesktopServices::setUrlHandler(QString("bar"), &barHandler, "handle");
-#ifndef CAN_IMPLICITLY_UNSET
     const auto unsetHandlers = qScopeGuard([] {
         QDesktopServices::unsetUrlHandler(u"bar"_s);
         QDesktopServices::unsetUrlHandler(u"foo"_s);
     });
-#endif
 
     QUrl fooUrl("foo://blub/meh");
     QUrl barUrl("bar://hmm/hmmmm");
@@ -68,15 +62,6 @@ void tst_qdesktopservices::handlers()
 
     QCOMPARE(fooHandler.lastHandledUrl.toString(), fooUrl.toString());
     QCOMPARE(barHandler.lastHandledUrl.toString(), barUrl.toString());
-
-#ifdef CAN_IMPLICITLY_UNSET
-    for (int i = 0; i < 2; ++i)
-        QTest::ignoreMessage(QtWarningMsg,
-                             "Please call QDesktopServices::unsetUrlHandler() before destroying a "
-                             "registered URL handler object.\n"
-                             "Support for destroying a registered URL handler object is deprecated, "
-                             "and will be removed in Qt 6.6.");
-#endif
 }
 
 QTEST_MAIN(tst_qdesktopservices)