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

Qt4PM: Support "Build File" for debug_and_release configurations

Browse Source 
Task-number: QTCREATORBUG-106

Change-Id: I9aef17f8b57051ee4b7d22cc4e454d453ea4c821
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-05-14 22:58:34 +03:00
committed by Daniel Teske
parent 3815988c8a
commit 5c23c44ed0
4 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1469,7 +1469,7 @@ QString Qt4ProFileNode::objectExtension() const
QString Qt4ProFileNode::objectsDirectory() const
{
if (m_varValues[ObjectsDir].isEmpty())
return buildDir();
return QString();
return m_varValues[ObjectsDir].first();
}
@@ -1571,8 +1571,7 @@ bool Qt4ProFileNode::hasBuildTargets(Qt4ProjectType projectType) const
bool Qt4ProFileNode::isDebugAndRelease() const
{
const QStringList configValues = m_varValues.value(ConfigVar);
return (configValues.contains(QLatin1String("debug_and_release"))
&& configValues.contains(QLatin1String("debug_and_release_target")));
return configValues.contains(QLatin1String("debug_and_release"));
}
Qt4ProjectType Qt4ProFileNode::projectType() const