From 815cdf618720198d8fb884ed6abcdcfd9a4c593b Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 27 Apr 2022 20:21:27 +0200
Subject: QXdgDesktopPortalThemePlugin: includemocs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Including moc files directly into their classes' TU tends to improve
codegen and enables extended compiler warnings, e.g. about unused
private functions or fields.

Task-number: QTBUG-102886
Change-Id: I564107743e093d880d7d201f45e44207055ad7cf
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 07d3b12eb2104152660030d1fc71867e7a37700e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp     | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp')

diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
index d029c50faa..45377cfbe7 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
@@ -466,3 +466,5 @@ void QXdgDesktopPortalFileDialog::gotResponse(uint response, const QVariantMap &
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qxdgdesktopportalfiledialog_p.cpp"
-- 
cgit v1.2.3


From f4942f2616f2c19ef5060e47097327fc58ed8edb Mon Sep 17 00:00:00 2001
From: JiDe Zhang <zhangjide@uniontech.com>
Date: Tue, 28 Sep 2021 17:46:16 +0800
Subject: Fix memory leak

Destroy the QDBusPendingCallWatcher object when received
the QDBusPendingCallWatcher::finished signal later.

Change-Id: I1ec67bf7c286f38200c374ad92df2a1579588a8a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 71ba53e3a7b63da1ac8755dba8b9311774d46103)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp      | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp')

diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
index 45377cfbe7..857f201c73 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
@@ -302,6 +302,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
                                                   this,
                                                   SLOT(gotResponse(uint,QVariantMap)));
         }
+        watcher->deleteLater();
     });
 }
 
-- 
cgit v1.2.3