Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl5.15

Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9

1 files changed, 23 insertions, 1 deletions

diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index fbb63a9408..4446b4297a 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -54,6 +54,8 @@
 #include <qpa/qplatformintegration.h>
 #include <qdir.h>
 
+#include <QtCore/private/qlocking_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QOpenUrlHandlerRegistry : public QObject
@@ -72,24 +74,33 @@ public:
     typedef QHash<QString, Handler> HandlerHash;
     HandlerHash handlers;
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 public Q_SLOTS:
     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
@@ -279,6 +290,10 @@ bool QDesktopServices::openUrl(const QUrl &url)
     Note that the handler will always be called from within the same thread that
     calls QDesktopServices::openUrl().
 
+    You must call unsetUrlHandler() before destroying the handler object, so
+    the destruction of the handler object does not overlap with concurrent
+    invocations of openUrl() using it.
+
     \sa openUrl(), unsetUrlHandler()
 */
 void QDesktopServices::setUrlHandler(const QString &scheme, QObject *receiver, const char *method)
@@ -293,13 +308,20 @@ 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, SIGNAL(destroyed(QObject*)),
-                     registry, SLOT(handlerDestroyed(QObject*)));
+                     registry, SLOT(handlerDestroyed(QObject*)),
+                     Qt::DirectConnection);
+#endif
 }
 
 /*!
     Removes a previously set URL handler for the specified \a scheme.
 
+    Call this function before the handler object that was registered for \a scheme
+    is destroyed, to prevent concurrent openUrl() calls from continuing to call
+    the destroyed handler object.
+
     \sa setUrlHandler()
 */
 void QDesktopServices::unsetUrlHandler(const QString &scheme)