From 5f00bafb1cc6168c9aa6ab031890b83d410326e8 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Wed, 7 Aug 2013 14:18:19 +0200
Subject: [PATCH] Qbs: Better support for consoleApplications

Change-Id: I673196c668b53a9b53065438ed860048eb1307ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 8 ++++++--
 src/plugins/qbsprojectmanager/qbsrunconfiguration.h   | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index f0196aaedbf..80a576b5962 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -204,14 +204,18 @@ QString QbsRunConfiguration::executable() const
 
 ProjectExplorer::LocalApplicationRunConfiguration::RunMode QbsRunConfiguration::runMode() const
 {
-    if (m_forcedGuiMode)
+    if (forcedGuiMode())
         return LocalApplicationRunConfiguration::Gui;
+
     return m_runMode;
 }
 
 bool QbsRunConfiguration::forcedGuiMode() const
 {
-    return m_forcedGuiMode;
+    QbsProject *pro = static_cast<QbsProject *>(target()->project());
+    const qbs::ProductData product = findProduct(pro->qbsProjectData(), m_qbsProduct);
+
+    return !product.properties().getProperty(QLatin1String("consoleApplication")).toBool();
 }
 
 QString QbsRunConfiguration::workingDirectory() const
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
index 5f7afeec43a..469c6089cf9 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
@@ -128,7 +128,6 @@ private:
 
     // Cached startup sub project information
     ProjectExplorer::LocalApplicationRunConfiguration::RunMode m_runMode;
-    bool m_forcedGuiMode;
     bool m_userSetName;
     QString m_userWorkingDirectory;