summaryrefslogtreecommitdiffstats
path: root/src/gui/platform/unix/qdesktopunixservices_p.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2025-03-26 08:06:04 +0100
committerMarc Mutz <marc.mutz@qt.io>2025-03-28 06:56:15 +0000
commit567da5e3e0070b7a0dd9ba1acbe9347c6cc1d0fe (patch)
tree40bda123c7bc3dc75c6f4091e894375258625b9a /src/gui/platform/unix/qdesktopunixservices_p.h
parent83af06b0e5d1ca3aa348debd39f88dfbdbf117b8 (diff)
QDesktopUnixServices: don't leak the QDBusPendingCallWatcher
When, like in tst_QApplication::qtbug_103611(), a QApplication object is destroyed without calling exec(), then QDesktopUnixServices leaked its QDBusPendingCallWatcher, because the connection to the slot that would deleteLater() the watcher was disconnected, and the watcher had no QObject parent that would otherwise reap it. Fix by actually deleting the watcher in ~QDesktopUnixServices(), if it still exists (which implies disconnecting, of course). This makes tst_QApplication asan-clean on Linux/X11 (was: "75466 bytes leaked in 965 allocations"). Amends de609d84b9cee4a481d1718c00b09105d8c2ae69. Pick-to: 6.9 6.8 6.5 Change-Id: I28a08abdb1be65a8746702ad304282de4e1100d7 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/platform/unix/qdesktopunixservices_p.h')
-rw-r--r--src/gui/platform/unix/qdesktopunixservices_p.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/platform/unix/qdesktopunixservices_p.h b/src/gui/platform/unix/qdesktopunixservices_p.h
index f52dc35bbe2..903bd6e6510 100644
--- a/src/gui/platform/unix/qdesktopunixservices_p.h
+++ b/src/gui/platform/unix/qdesktopunixservices_p.h
@@ -16,11 +16,14 @@
//
#include <qpa/qplatformservices.h>
+
+#include <QtCore/qpointer.h>
#include <QtCore/QString>
#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
+class QDBusPendingCallWatcher;
class QWindow;
class Q_GUI_EXPORT QDesktopUnixServices : public QPlatformServices
@@ -46,7 +49,7 @@ private:
QString m_webBrowser;
QString m_documentLauncher;
#if QT_CONFIG(dbus)
- QMetaObject::Connection m_watcherConnection;
+ QPointer<QDBusPendingCallWatcher> m_watcher = nullptr;
#endif
bool m_hasScreenshotPortalWithColorPicking = false;
};