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

Qbs: Better support for consoleApplications

Browse Source 
Change-Id: I673196c668b53a9b53065438ed860048eb1307ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-08-07 14:18:19 +02:00
parent 27b4802988
commit 5f00bafb1c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -204,14 +204,18 @@ QString QbsRunConfiguration::executable() const
ProjectExplorer::LocalApplicationRunConfiguration::RunMode QbsRunConfiguration::runMode() const ProjectExplorer::LocalApplicationRunConfiguration::RunMode QbsRunConfiguration::runMode() const
{ {
if (m_forcedGuiMode) if (forcedGuiMode())
return LocalApplicationRunConfiguration::Gui; return LocalApplicationRunConfiguration::Gui;
return m_runMode; return m_runMode;
} }
bool QbsRunConfiguration::forcedGuiMode() const 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 QString QbsRunConfiguration::workingDirectory() const

1
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
View File

@@ -128,7 +128,6 @@ private:
// Cached startup sub project information // Cached startup sub project information
ProjectExplorer::LocalApplicationRunConfiguration::RunMode m_runMode; ProjectExplorer::LocalApplicationRunConfiguration::RunMode m_runMode;
bool m_forcedGuiMode;
bool m_userSetName; bool m_userSetName;
QString m_userWorkingDirectory; QString m_userWorkingDirectory;