Commit 5f00bafb authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Qbs: Better support for consoleApplications



Change-Id: I673196c668b53a9b53065438ed860048eb1307ca
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 27b48029
...@@ -204,14 +204,18 @@ QString QbsRunConfiguration::executable() const ...@@ -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
......
...@@ -128,7 +128,6 @@ private: ...@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment