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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac
This commit is contained in:
Eike Ziller
2018-05-28 16:10:23 +02:00
parent 005b0c1147 c1c57f0c38
commit c8c6b28e22
206 changed files with 2634 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -33,7 +33,6 @@
#include "environmentaspect.h"
#include "kitinformation.h"
#include "runconfigurationaspects.h"
#include "runnables.h"
#include "session.h"
#include "kitinformation.h"
@@ -458,7 +457,7 @@ IRunConfigurationAspect *RunConfiguration::extraAspect(Core::Id id) const
Runnable RunConfiguration::runnable() const
{
StandardRunnable r;
Runnable r;
if (auto aspect = extraAspect<ExecutableAspect>())
r.executable = aspect->executable().toString();
if (auto aspect = extraAspect<ArgumentsAspect>())
@@ -872,8 +871,7 @@ public:
runnable = runConfiguration->runnable();
displayName = runConfiguration->displayName();
outputFormatter = runConfiguration->createOutputFormatter();
if (runnable.is<StandardRunnable>())
device = runnable.as<StandardRunnable>().device;
device = runnable.device;
if (!device)
device = DeviceKitInformation::device(runConfiguration->target()->kit());
project = runConfiguration->target()->project();
@@ -1440,7 +1438,10 @@ bool RunControl::canReUseOutputPane(const RunControl *other) const
if (!other || other->isRunning())
return false;
return d->runnable.canReUseOutputPane(other->d->runnable);
return d->runnable.executable == other->d->runnable.executable
&& d->runnable.commandLineArguments == other->d->runnable.commandLineArguments
&& d->runnable.workingDirectory == other->d->runnable.workingDirectory
&& d->runnable.environment == other->d->runnable.environment;
}
/*!
@@ -1634,12 +1635,6 @@ void RunControl::appendMessage(const QString &msg, Utils::OutputFormat format)
emit appendMessageRequested(this, msg, format);
}
bool Runnable::canReUseOutputPane(const Runnable &other) const
{
return d ? d->canReUseOutputPane(other.d) : (other.d.get() == 0);
}
// SimpleTargetRunner
SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl)
@@ -1675,8 +1670,7 @@ void SimpleTargetRunner::start()
connect(&m_launcher, &ApplicationLauncher::error,
this, &SimpleTargetRunner::onProcessError);
QTC_ASSERT(m_runnable.is<StandardRunnable>(), return);
const QString executable = m_runnable.as<StandardRunnable>().executable;
const QString executable = m_runnable.executable;
if (executable.isEmpty()) {
reportFailure(RunControl::tr("No executable specified."));
} else {