Merge remote-tracking branch 'origin/4.5'

Change-Id: I0194bdeda71e33fd5bc9cb3eb7a9198ae72815ed

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -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();

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -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);