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

CMake: Use QtOutputFormatter for CMakeRunConfigurations

Browse Source 
Use QtOutputFormatter for CMake run configurations that belong to targets
with Qt configured.

Task-number: QTCREATORBUG-18586
Change-Id: Iedb6d7079649022b2ba6dabef37b79c0d33b8635
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-11-03 12:40:49 +01:00
parent d0fe839451
commit 9ca74997d5
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -32,6 +32,7 @@
#include <coreplugin/coreicons.h>
#include <coreplugin/helpmanager.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtoutputformatter.h>
#include <projectexplorer/localenvironmentaspect.h>
#include <projectexplorer/runconfigurationaspects.h>
#include <projectexplorer/target.h>
@@ -171,6 +172,13 @@ QString CMakeRunConfiguration::disabledReason() const
return RunConfiguration::disabledReason();
}
Utils::OutputFormatter *CMakeRunConfiguration::createOutputFormatter() const
{
if (QtSupport::QtKitInformation::qtVersion(target()->kit()))
return new QtSupport::QtOutputFormatter(target()->project());
return RunConfiguration::createOutputFormatter();
}
static void updateExecutable(CMakeRunConfiguration *rc, Utils::FancyLineEdit *fle)
{
const Runnable runnable = rc->runnable();

2
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
View File

@@ -54,6 +54,8 @@ public:
QString buildSystemTarget() const final { return m_buildSystemTarget; }
Utils::OutputFormatter *createOutputFormatter() const final;
private:
void initialize(Core::Id id, const QString &target,
const Utils::FileName &workingDirectory, const QString &title);