diff options
| author | hjk <hjk@qt.io> | 2018-05-16 15:42:03 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-05-23 08:48:36 +0000 |
| commit | 36b835ff0ac1f6ab7b2ae8aab789352a9e297c21 (patch) | |
| tree | b3a63ee0ba58ca3bcfdb7631963f452c3658b8c3 /src/plugins/qmlprofiler | |
| parent | fdccc542754bc5361b8391ecd3902a88a84ab3cf (diff) | |
| download | qt-creator-36b835ff0ac1f6ab7b2ae8aab789352a9e297c21.tar.gz | |
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/qmlprofiler')
4 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index 98345f8e6f..18688ce367 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -35,7 +35,6 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorericons.h> #include <projectexplorer/runconfiguration.h> -#include <projectexplorer/runnables.h> #include <projectexplorer/target.h> #include <qtsupport/baseqtversion.h> @@ -244,7 +243,7 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(QmlProfilerTool *profilerTool, // In the TCP case, it doesn't hurt either to start the profiler before. addStartDependency(m_profiler); - StandardRunnable debuggee = runnable().as<StandardRunnable>(); + Runnable debuggee = runnable(); QString code; if (serverUrl.scheme() == Utils::urlSocketScheme()) diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h index 1236961049..c9c9c5b38a 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h @@ -28,7 +28,6 @@ #include "qmlprofilerstatemanager.h" #include <projectexplorer/runconfiguration.h> -#include <projectexplorer/runnables.h> #include <utils/outputformat.h> #include <utils/port.h> diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 3325284830..1dad4de1ee 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -54,7 +54,6 @@ #include <projectexplorer/target.h> #include <projectexplorer/session.h> #include <projectexplorer/kitinformation.h> -#include <projectexplorer/runnables.h> #include <projectexplorer/taskhub.h> #include <texteditor/texteditor.h> diff --git a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp index 2ee5906935..2181dfbd33 100644 --- a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp +++ b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp @@ -26,7 +26,7 @@ #include "localqmlprofilerrunner_test.h" #include <debugger/analyzer/analyzermanager.h> -#include <projectexplorer/runnables.h> + #include <qmlprofiler/qmlprofilerruncontrol.h> #include <qmlprofiler/qmlprofilertool.h> @@ -48,7 +48,7 @@ void LocalQmlProfilerRunnerTest::testRunner() QmlProfilerTool tool; QPointer<ProjectExplorer::RunControl> runControl; QPointer<LocalQmlProfilerSupport> profiler; - ProjectExplorer::StandardRunnable debuggee; + ProjectExplorer::Runnable debuggee; QUrl serverUrl; bool running = false; |