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

Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

Browse Source
This commit is contained in:
Eike Ziller
2012-09-05 13:42:40 +02:00
parent a8c524d40a aeef46d93a
commit 16a1a2653a
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1389,9 +1389,7 @@ TargetInformation Qt4ProFileNode::targetInformation(const QString &fileName) con
QString Qt4ProFileNode::makefile() const QString Qt4ProFileNode::makefile() const
{ {
if (m_varValues[Makefile].isEmpty()) return singleVariableValue(Makefile);
return QString();
return m_varValues[Makefile].first();
} }
QString Qt4ProFileNode::objectExtension() const QString Qt4ProFileNode::objectExtension() const
@@ -1403,9 +1401,7 @@ QString Qt4ProFileNode::objectExtension() const
QString Qt4ProFileNode::objectsDirectory() const QString Qt4ProFileNode::objectsDirectory() const
{ {
if (m_varValues[ObjectsDir].isEmpty()) return singleVariableValue(ObjectsDir);
return QString();
return m_varValues[ObjectsDir].first();
} }
QByteArray Qt4ProFileNode::cxxDefines() const QByteArray Qt4ProFileNode::cxxDefines() const