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

Finish merging Runnable and StandardRunnable

Browse Source 
As all Runnables are known to be StandardRunnables, this here
essentially replaces all .is<StandardRunnable> by 'true'.
.as<StandardRunnable> by no-op, and fixes the fallout.

Change-Id: I1632f8e164fa0a9dff063df47a9e191fdf7bbb2e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-05-16 15:42:03 +02:00
parent fdccc54275
commit 36b835ff0a
73 changed files with 147 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,10 +97,7 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
RunControl::registerWorker(QML_PREVIEW_RUN_MODE, [](RunControl *runControl) -> RunWorker* {
const Runnable runnable = runControl->runConfiguration()->runnable();
QTC_ASSERT(runnable.is<StandardRunnable>(), return nullptr);
const StandardRunnable standardRunnable = runnable.as<StandardRunnable>();
return new AndroidQmlToolingSupport(runControl, standardRunnable.executable,
standardRunnable.commandLineArguments);
return new AndroidQmlToolingSupport(runControl, runnable.executable, runnable.commandLineArguments);
}, [](RunConfiguration *runConfig) {
return runConfig->isEnabled()
&& runConfig->id().name().startsWith("QmlProjectManager.QmlRunConfiguration")