aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-05-16 15:42:03 +0200
committerhjk <hjk@qt.io>2018-05-23 08:48:36 +0000
commit36b835ff0ac1f6ab7b2ae8aab789352a9e297c21 (patch)
treeb3a63ee0ba58ca3bcfdb7631963f452c3658b8c3 /src/plugins/android/androidplugin.cpp
parentfdccc542754bc5361b8391ecd3902a88a84ab3cf (diff)
Finish merging Runnable and StandardRunnable
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>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
-rw-r--r--src/plugins/android/androidplugin.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index c9360527fb4..6f44abbbbd3 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -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")