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

ProjectExplorer: Use runnable contents for appoutputpane re-use

Browse Source 
Change-Id: I6dd4b9258321a23462bb6488b132aa9f3d1ed5c2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2016-02-01 14:30:13 +01:00
parent e4dca97fc6
commit 2fd286cc93
10 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,6 +655,14 @@ Project *RunControl::project() const
return d->project.data();
}
bool RunControl::canReUseOutputPane(const RunControl *other) const
{
if (other->isRunning())
return false;
return d->runnable == other->d->runnable;
}
ProcessHandle RunControl::applicationProcessHandle() const
{
return d->applicationProcessHandle;
@@ -723,11 +731,6 @@ bool RunControl::showPromptToStopDialog(const QString &title,
return close;
}
bool RunControl::sameRunConfiguration(const RunControl *other) const
{
return other->d->runConfiguration.data() == d->runConfiguration.data();
}
void RunControl::bringApplicationToForeground(qint64 pid)
{
#ifdef Q_OS_OSX
@@ -760,4 +763,9 @@ void RunControl::appendMessage(const QString &msg, Utils::OutputFormat format)
emit appendMessage(this, msg, format);
}
bool Runnable::operator==(const Runnable &other) const
{
return d ? d->equals(other.d) : (other.d.get() == 0);
}
} // namespace ProjectExplorer