feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Replace one overload of RunControl::registerWorker

Browse Source 
... by using factory members in the plugin pimpl. This also
(intentionally) transfers ownership of the factories to the
plugins, effectively progressing on the "FIXME:"
in runcontrol.h:164.

Change-Id: Ia75ee034d25a75b5d5bff6b2fa2b3471347d1a14
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-03-20 11:40:53 +01:00
parent 9dac076650
commit 00eae6f204
3 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/android/androidplugin.cpp
View File

@@ -88,6 +88,25 @@ public:
}
};
class QmlPreviewRunWorkerFactory : public RunWorkerFactory
{
public:
QmlPreviewRunWorkerFactory()
{
addSupportedRunMode(QML_PREVIEW_RUN_MODE);
setProducer([](RunControl *runControl) -> RunWorker * {
const Runnable runnable = runControl->runConfiguration()->runnable();
return new AndroidQmlToolingSupport(runControl, runnable.executable);
});
addConstraint([](RunConfiguration *runConfig) {
return runConfig->isEnabled()
&& runConfig->id().name().startsWith("QmlProjectManager.QmlRunConfiguration")
&& DeviceTypeKitAspect::deviceTypeId(runConfig->target()->kit())
== Android::Constants::ANDROID_DEVICE_TYPE;
});
}
};
class AndroidPluginPrivate : public QObject
{
public:
@@ -131,6 +150,7 @@ public:
AndroidPackageInstallationFactory packackeInstallationFactory;
AndroidManifestEditorFactory manifestEditorFactory;
AndroidRunConfigurationFactory runConfigFactory;
SimpleRunWorkerFactory<AndroidRunConfiguration, AndroidRunSupport> runWorkerFactory;
SimpleRunWorkerFactory<AndroidRunConfiguration, AndroidDebugSupport>
debugWorkerFactory{DEBUG_RUN_MODE};
@@ -138,6 +158,8 @@ public:
profilerWorkerFactory{QML_PROFILER_RUN_MODE};
SimpleRunWorkerFactory<AndroidRunConfiguration, AndroidQmlToolingSupport>
qmlPreviewWorkerFactory{QML_PREVIEW_RUN_MODE};
QmlPreviewRunWorkerFactory qmlPreviewWorkerFactory2;
AndroidBuildApkStepFactory buildApkStepFactory;
AndroidGdbServerKitAspect gdbServerKitAspect;
};
@@ -152,16 +174,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
Q_UNUSED(arguments);
Q_UNUSED(errorMessage);
RunControl::registerWorker(QML_PREVIEW_RUN_MODE, [](RunControl *runControl) -> RunWorker* {
const Runnable runnable = runControl->runConfiguration()->runnable();
return new AndroidQmlToolingSupport(runControl, runnable.executable);
}, [](RunConfiguration *runConfig) {
return runConfig->isEnabled()
&& runConfig->id().name().startsWith("QmlProjectManager.QmlRunConfiguration")
&& DeviceTypeKitAspect::deviceTypeId(runConfig->target()->kit())
== Android::Constants::ANDROID_DEVICE_TYPE;
});
d = new AndroidPluginPrivate;
connect(KitManager::instance(), &KitManager::kitsLoaded,