summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-08-08 14:09:50 +0200
committerUlf Hermann <ulf.hermann@qt.io>2017-08-08 13:57:38 +0000
commit8b5582c4248d8c06eb3a39127fdf0580bf2de5d0 (patch)
treee2977b2ac462460eef643f17e499e2af8a206c27
parent376b1f32dc683bf34ab9cf81e95745cae3adfbe1 (diff)
downloadqt-creator-8b5582c4248d8c06eb3a39127fdf0580bf2de5d0.tar.gz
ProjectExplorer: Rename worker dependencies to "startDependencies"
There will be stopDependencies, too, which apply when stopping the runcontrol. Change-Id: Id72771d28cbb6b254572c9f93db93e0d054b890f Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/plugins/android/androidanalyzesupport.cpp4
-rw-r--r--src/plugins/android/androiddebugsupport.cpp2
-rw-r--r--src/plugins/baremetal/baremetaldebugsupport.cpp2
-rw-r--r--src/plugins/ios/iosrunner.cpp6
-rw-r--r--src/plugins/projectexplorer/runconfiguration.cpp8
-rw-r--r--src/plugins/projectexplorer/runconfiguration.h2
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp4
-rw-r--r--src/plugins/qnx/qnxanalyzesupport.cpp6
-rw-r--r--src/plugins/qnx/qnxdebugsupport.cpp6
-rw-r--r--src/plugins/remotelinux/remotelinuxanalyzesupport.cpp6
-rw-r--r--src/plugins/remotelinux/remotelinuxdebugsupport.cpp4
-rw-r--r--src/plugins/valgrind/memcheckengine.cpp2
12 files changed, 26 insertions, 26 deletions
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index eaea7196ba..59ccb047ca 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -37,10 +37,10 @@ AndroidQmlProfilerSupport::AndroidQmlProfilerSupport(RunControl *runControl)
setDisplayName("AndroidQmlProfilerSupport");
auto runner = new AndroidRunner(runControl);
- addDependency(runner);
+ addStartDependency(runner);
auto profiler = runControl->createWorker(runControl->runMode());
- profiler->addDependency(this);
+ profiler->addStartDependency(this);
connect(runner, &AndroidRunner::qmlServerReady, [this, runner, profiler](const QUrl &server) {
profiler->recordData("QmlServerUrl", server);
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 31f7f304ae..92b80cf2cf 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -99,7 +99,7 @@ AndroidDebugSupport::AndroidDebugSupport(RunControl *runControl)
{
setDisplayName("AndroidDebugger");
m_runner = new AndroidRunner(runControl);
- addDependency(m_runner);
+ addStartDependency(m_runner);
}
void AndroidDebugSupport::start()
diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp
index af978bfd61..278e018f1c 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.cpp
+++ b/src/plugins/baremetal/baremetaldebugsupport.cpp
@@ -72,7 +72,7 @@ BareMetalDebugSupport::BareMetalDebugSupport(RunControl *runControl)
r.commandLineArguments = Utils::QtcProcess::joinArgs(p->arguments(), Utils::HostOsInfo::hostOs());
m_gdbServer = new SimpleTargetRunner(runControl);
m_gdbServer->setRunnable(r);
- addDependency(m_gdbServer);
+ addStartDependency(m_gdbServer);
}
}
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 7ecd50b836..a57dbd461f 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -394,10 +394,10 @@ IosQmlProfilerSupport::IosQmlProfilerSupport(RunControl *runControl)
m_runner = new IosRunner(runControl);
m_runner->setQmlDebugging(QmlDebug::QmlProfilerServices);
- addDependency(m_runner);
+ addStartDependency(m_runner);
m_profiler = runControl->createWorker(runControl->runMode());
- m_profiler->addDependency(this);
+ m_profiler->addStartDependency(this);
}
void IosQmlProfilerSupport::start()
@@ -428,7 +428,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
m_runner->setCppDebugging(isCppDebugging());
m_runner->setQmlDebugging(isQmlDebugging() ? QmlDebug::QmlDebuggerServices : QmlDebug::NoQmlDebugServices);
- addDependency(m_runner);
+ addStartDependency(m_runner);
}
void IosDebugSupport::start()
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index a570dbbd50..740fd8ebbb 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -537,7 +537,7 @@ public:
RunWorker *q;
RunWorkerState state = RunWorkerState::Initialized;
QPointer<RunControl> runControl;
- QList<RunWorker *> dependencies;
+ QList<RunWorker *> startDependencies;
QString id;
QVariantMap data;
@@ -1455,7 +1455,7 @@ bool RunWorkerPrivate::canStart() const
{
if (state != RunWorkerState::Initialized)
return false;
- for (RunWorker *worker : dependencies) {
+ for (RunWorker *worker : startDependencies) {
QTC_ASSERT(worker, return true);
if (worker->d->state != RunWorkerState::Done
&& worker->d->state != RunWorkerState::Running)
@@ -1618,9 +1618,9 @@ Core::Id RunWorker::runMode() const
return d->runControl->runMode();
}
-void RunWorker::addDependency(RunWorker *dependency)
+void RunWorker::addStartDependency(RunWorker *dependency)
{
- d->dependencies.append(dependency);
+ d->startDependencies.append(dependency);
}
RunControl *RunWorker::runControl() const
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 8bb32c1e08..c9f3fae9be 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -322,7 +322,7 @@ public:
RunControl *runControl() const;
- void addDependency(RunWorker *dependency);
+ void addStartDependency(RunWorker *dependency);
void setDisplayName(const QString &id) { setId(id); } // FIXME: Obsoleted by setId.
void setId(const QString &id);
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index f009a99429..7456c6efae 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -308,7 +308,7 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(RunControl *runControl, const Q
m_profiler = new QmlProfilerRunner(runControl);
m_profiler->setServerUrl(serverUrl);
- m_profiler->addDependency(this);
+ m_profiler->addStartDependency(this);
StandardRunnable debuggee = runnable().as<StandardRunnable>();
QString arguments = QmlDebug::qmlDebugArguments(QmlDebug::QmlProfilerServices, serverUrl);
@@ -321,7 +321,7 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(RunControl *runControl, const Q
m_profilee = new SimpleTargetRunner(runControl);
m_profilee->setRunnable(debuggee);
- addDependency(m_profilee);
+ addStartDependency(m_profilee);
}
void LocalQmlProfilerSupport::start()
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp
index 4a7d89ac63..f5e182a8e3 100644
--- a/src/plugins/qnx/qnxanalyzesupport.cpp
+++ b/src/plugins/qnx/qnxanalyzesupport.cpp
@@ -87,12 +87,12 @@ QnxQmlProfilerSupport::QnxQmlProfilerSupport(RunControl *runControl)
auto portsGatherer = new PortsGatherer(runControl);
auto debuggeeRunner = new QnxAnalyzeeRunner(runControl, portsGatherer);
- debuggeeRunner->addDependency(portsGatherer);
+ debuggeeRunner->addStartDependency(portsGatherer);
auto slog2InfoRunner = new Slog2InfoRunner(runControl);
- slog2InfoRunner->addDependency(debuggeeRunner);
+ slog2InfoRunner->addStartDependency(debuggeeRunner);
- addDependency(slog2InfoRunner);
+ addStartDependency(slog2InfoRunner);
// QmlDebug::QmlOutputParser m_outputParser;
// FIXME: m_outputParser needs to be fed with application output
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 1832e1d3ab..e560ed285e 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -99,12 +99,12 @@ QnxDebugSupport::QnxDebugSupport(RunControl *runControl)
m_portsGatherer->setUseQmlServer(isQmlDebugging());
auto debuggeeRunner = new QnxDebuggeeRunner(runControl, m_portsGatherer);
- debuggeeRunner->addDependency(m_portsGatherer);
+ debuggeeRunner->addStartDependency(m_portsGatherer);
auto slog2InfoRunner = new Slog2InfoRunner(runControl);
- slog2InfoRunner->addDependency(debuggeeRunner);
+ slog2InfoRunner->addStartDependency(debuggeeRunner);
- addDependency(slog2InfoRunner);
+ addStartDependency(slog2InfoRunner);
}
void QnxDebugSupport::start()
diff --git a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
index 72a85f53e1..996e4e9527 100644
--- a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
@@ -58,10 +58,10 @@ RemoteLinuxQmlProfilerSupport::RemoteLinuxQmlProfilerSupport(RunControl *runCont
setDisplayName("RemoteLinuxQmlProfilerSupport");
m_portsGatherer = new PortsGatherer(runControl);
- addDependency(m_portsGatherer);
+ addStartDependency(m_portsGatherer);
m_profiler = runControl->createWorker(runControl->runMode());
- m_profiler->addDependency(this);
+ m_profiler->addStartDependency(this);
}
void RemoteLinuxQmlProfilerSupport::start()
@@ -102,7 +102,7 @@ RemoteLinuxPerfSupport::RemoteLinuxPerfSupport(RunControl *runControl)
.join(' ');
auto toolRunner = runControl->createWorker(runControl->runMode());
- toolRunner->addDependency(this);
+ toolRunner->addStartDependency(this);
// connect(&m_outputGatherer, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort,
// this, &RemoteLinuxPerfSupport::remoteIsRunning);
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index 2d74283218..4ce28bbc16 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -57,9 +57,9 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
m_portsGatherer->setUseQmlServer(isQmlDebugging());
auto gdbServer = new GdbServerRunner(runControl, m_portsGatherer);
- gdbServer->addDependency(m_portsGatherer);
+ gdbServer->addStartDependency(m_portsGatherer);
- addDependency(gdbServer);
+ addStartDependency(gdbServer);
RunConfiguration *runConfig = runControl->runConfiguration();
if (auto rlrc = qobject_cast<RemoteLinuxRunConfiguration *>(runConfig))
diff --git a/src/plugins/valgrind/memcheckengine.cpp b/src/plugins/valgrind/memcheckengine.cpp
index 4e25251e4b..8e80ef1165 100644
--- a/src/plugins/valgrind/memcheckengine.cpp
+++ b/src/plugins/valgrind/memcheckengine.cpp
@@ -97,7 +97,7 @@ MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl, bool withGdb)
// We need a real address to connect to from the outside.
if (device()->type() != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE)
- addDependency(new LocalAddressFinder(runControl, &m_localServerAddress));
+ addStartDependency(new LocalAddressFinder(runControl, &m_localServerAddress));
}
QString MemcheckToolRunner::progressTitle() const