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

Give our Profile parser more information from the qmakestep

Browse Source 
e.g. DEFINES+=bla on the qmakestep command line now work

Task-Nr: QTCREATORBUG-2091
This commit is contained in:
dt
2010-09-01 12:33:53 +02:00
parent 9ff1e0be09
commit 9f68456b65
7 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@
#include "qt4projectmanagerconstants.h"
#include "qtuicodemodelsupport.h"
#include "qt4buildconfiguration.h"
#include "qmakestep.h"
#include <projectexplorer/nodesvisitor.h>
@@ -1311,12 +1312,13 @@ void Qt4ProFileNode::setupReader()
m_readerCumulative = m_project->createProFileReader(this);
// Find out what flags we pass on to qmake
QStringList addedUserConfigArguments;
QStringList removedUserConfigArguments;
m_project->activeTarget()->activeBuildConfiguration()->getConfigCommandLineArguments(&addedUserConfigArguments, &removedUserConfigArguments);
m_readerExact->setConfigCommandLineArguments(addedUserConfigArguments, removedUserConfigArguments);
m_readerCumulative->setConfigCommandLineArguments(addedUserConfigArguments, removedUserConfigArguments);
QStringList args;
if (QMakeStep *qs = m_project->activeTarget()->activeBuildConfiguration()->qmakeStep())
args = qs->parserArguments();
else
args = m_project->activeTarget()->activeBuildConfiguration()->configCommandLineArguments();
m_readerExact->setCommandLineArguments(args);
m_readerCumulative->setCommandLineArguments(args);
}
bool Qt4ProFileNode::evaluate()