diff options
author | hjk <hjk@theqtcompany.com> | 2015-06-19 09:34:52 +0200 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2015-06-19 09:49:16 +0000 |
commit | efad927fc3e45ef0d464935b8c65ca2819a2989f (patch) | |
tree | b883392209459362f19179504f772e8f6d38af6a | |
parent | aa0d68ec3e0d8165548b4136768168cbb08c51c2 (diff) |
Analyzer: Remove AnalyzerStartParameter::useStartupProject
Not used anymore.
Change-Id: I97da63a3bfabbdcf5ccbd36178832ea47d913d04
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
-rw-r--r-- | src/plugins/analyzerbase/analyzerstartparameters.h | 12 | ||||
-rw-r--r-- | src/plugins/analyzerbase/ianalyzertool.cpp | 3 | ||||
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertool.cpp | 1 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/analyzerbase/analyzerstartparameters.h index 83e800c8ef..e03f2e92d2 100644 --- a/src/plugins/analyzerbase/analyzerstartparameters.h +++ b/src/plugins/analyzerbase/analyzerstartparameters.h @@ -49,16 +49,10 @@ namespace Analyzer { class ANALYZER_EXPORT AnalyzerStartParameters { public: - AnalyzerStartParameters() - : useStartupProject(true), - localRunMode(ProjectExplorer::ApplicationLauncher::Gui), - analyzerPort(0) - {} - - bool useStartupProject; ProjectExplorer::RunMode runMode; QSsh::SshConnectionParameters connParams; - ProjectExplorer::ApplicationLauncher::Mode localRunMode; + ProjectExplorer::ApplicationLauncher::Mode localRunMode + = ProjectExplorer::ApplicationLauncher::Gui; QString debuggee; QString debuggeeArgs; @@ -67,7 +61,7 @@ public: QString workingDirectory; QString sysroot; QString analyzerHost; - quint16 analyzerPort; + quint16 analyzerPort = 0; }; } // namespace Analyzer diff --git a/src/plugins/analyzerbase/ianalyzertool.cpp b/src/plugins/analyzerbase/ianalyzertool.cpp index 4adb8e8eeb..d74d5e7ee8 100644 --- a/src/plugins/analyzerbase/ianalyzertool.cpp +++ b/src/plugins/analyzerbase/ianalyzertool.cpp @@ -72,8 +72,7 @@ bool AnalyzerAction::isRunnable(QString *reason) const AnalyzerRunControl *AnalyzerAction::tryCreateRunControl(const AnalyzerStartParameters &sp, RunConfiguration *runConfiguration) const { - const bool useStartupProject = !m_customToolStarter; - if (m_runMode == sp.runMode && useStartupProject == sp.useStartupProject) + if (m_runMode == sp.runMode) return m_runControlCreator(sp, runConfiguration); return 0; } diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 27df8eea89..2ea39855a0 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -476,7 +476,6 @@ void QmlProfilerTool::startRemoteTool() } AnalyzerStartParameters sp; - sp.useStartupProject = false; IDevice::ConstPtr device = DeviceKitInformation::device(kit); if (device) { |