diff options
author | hjk <[email protected]> | 2020-06-12 07:50:52 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2020-06-15 12:13:38 +0000 |
commit | beee392dd85ddb1b10bbd507967157bc6fc7f539 (patch) | |
tree | 2abd6316c2a04af4c67ce8f45400db7ab192b388 /src/plugins/android/androidplugin.cpp | |
parent | fcef4709bb140f1b22b16e8b3bae0bf887f0e315 (diff) |
ProjectExplorer: Consolidate RunConfigurationFactory::ids
It was already only one id string with two names. Since it is not
an id for the factory but the id of the created run configuration,
settle of runConfigurationId() as accessor.
The factory and id fields in RunConfigurationCreationInfo were
redundant. factory always implies (runconfiguration)id (but not
necessarily the other way round, in theory different factories
are possible for the same runconfiguration type for different
devices). So drop the id field here.
In one case now factory pointers instead of ids are compared, but
this is neutral there as this happens in a context of a fixed Target,
device and project are fixed there, so id and factory are equally
unique.
Change-Id: I859aa91486a2dd4abfc7369540a3322d6ec6260d
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
-rw-r--r-- | src/plugins/android/androidplugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index bbf890dce77..7b5a99f6587 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -120,22 +120,22 @@ public: RunWorkerFactory runWorkerFactory{ RunWorkerFactory::make<AndroidRunSupport>(), {NORMAL_RUN_MODE}, - {runConfigFactory.id()} + {runConfigFactory.runConfigurationId()} }; RunWorkerFactory debugWorkerFactory{ RunWorkerFactory::make<AndroidDebugSupport>(), {DEBUG_RUN_MODE}, - {runConfigFactory.id()} + {runConfigFactory.runConfigurationId()} }; RunWorkerFactory profilerWorkerFactory{ RunWorkerFactory::make<AndroidQmlToolingSupport>(), {QML_PROFILER_RUN_MODE}, - {runConfigFactory.id()} + {runConfigFactory.runConfigurationId()} }; RunWorkerFactory qmlPreviewWorkerFactory{ RunWorkerFactory::make<AndroidQmlToolingSupport>(), {QML_PREVIEW_RUN_MODE}, - {runConfigFactory.id()} + {runConfigFactory.runConfigurationId()} }; RunWorkerFactory qmlPreviewWorkerFactory2{ RunWorkerFactory::make<AndroidQmlPreviewWorker>(), |