From f0fcc4e5c517c2225263094c4895b04486f98ac9 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 20 Feb 2020 16:41:30 +0100 Subject: [PATCH] Android: Use timer for delayed execution Reduce need for moc. Change-Id: Ibbd85de60e891ca57738e44ad25e05e86ccb0c24 Reviewed-by: Assam Boudjelthia Reviewed-by: Alessandro Portale --- src/plugins/android/androidbuildapkstep.cpp | 3 ++- src/plugins/android/androidbuildapkstep.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 4384d8c89a6..3e3710dcc75 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -65,6 +65,7 @@ #include #include #include +#include #include #include @@ -296,7 +297,7 @@ void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus sta { AbstractProcessStep::processFinished(exitCode, status); if (m_openPackageLocationForRun && status == QProcess::NormalExit && exitCode == 0) - QMetaObject::invokeMethod(this, "showInGraphicalShell", Qt::QueuedConnection); + QTimer::singleShot(0, this, &AndroidBuildApkStep::showInGraphicalShell); } bool AndroidBuildApkStep::verifyKeystorePassword() diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h index 49ef9dc94e9..e60d2b7f382 100644 --- a/src/plugins/android/androidbuildapkstep.h +++ b/src/plugins/android/androidbuildapkstep.h @@ -79,7 +79,7 @@ public: QVariant data(Core::Id id) const override; private: - Q_INVOKABLE void showInGraphicalShell(); + void showInGraphicalShell(); bool init() override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;