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

20
src/shared/proparser/profileevaluator.cpp
View File

@@ -224,8 +224,7 @@ public:
QHash<const ProFile*, QHash<ProString, ProStringList> > m_filevaluemap; // Variables per include file
QString m_tmp1, m_tmp2, m_tmp3, m_tmp[2]; // Temporaries for efficient toQString
QStringList m_addUserConfigCmdArgs;
QStringList m_removeUserConfigCmdArgs;
QStringList m_cmdArgs;
ProFileOption *m_option;
ProFileParser *m_parser;
@@ -1274,11 +1273,13 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProFile(
if (tgt.isEmpty())
tgt.append(ProString(QFileInfo(pro->fileName()).baseName(), NoHash));
ProStringList &tmp = m_valuemapStack.top()[ProString("CONFIG")];
foreach (const QString &add, m_addUserConfigCmdArgs)
tmp.append(ProString(add, NoHash));
foreach (const QString &remove, m_removeUserConfigCmdArgs)
removeAll(&tmp, ProString(remove, NoHash));
if (ProFile *pro = m_parser->parsedProFile(
fL1S("(command line)"), false, m_cmdArgs.join(fL1S("\n")))) {
m_locationStack.push(m_current);
visitProBlock(pro, pro->tokPtr());
m_current = m_locationStack.pop();
pro->deref();
}
}
visitProBlock(pro, pro->tokPtr());
@@ -3217,10 +3218,9 @@ void ProFileEvaluator::setOutputDir(const QString &dir)
d->m_outputDir = dir;
}
void ProFileEvaluator::setConfigCommandLineArguments(const QStringList &addUserConfigCmdArgs, const QStringList &removeUserConfigCmdArgs)
void ProFileEvaluator::setCommandLineArguments(const QStringList &args)
{
d->m_addUserConfigCmdArgs = addUserConfigCmdArgs;
d->m_removeUserConfigCmdArgs = removeUserConfigCmdArgs;
d->m_cmdArgs = args;
}
QT_END_NAMESPACE