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

move command line args from ProFileEvaluator to ProFileOption

Browse Source
This commit is contained in:
Oswald Buddenhagen
2011-03-18 19:32:57 +01:00
parent 2e22ba59d9
commit 16436a252b
4 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,24 @@ ProFileOption::~ProFileOption()
{
}
void ProFileOption::setCommandLineArguments(const QStringList &args)
{
cmdargs = args;
setHostTargetMode();
bool targetModeSet = false;
for (int i = args.count() - 1; !targetModeSet && i >= 0; --i) {
for (int j = 0; j < modeMapSize; ++j) {
const TargetModeMapElement &mapElem = modeMap[j];
if (args.at(i) == QLatin1String(mapElem.qmakeOption)) {
target_mode = mapElem.targetMode;
targetModeSet = true;
break;
}
}
}
}
void ProFileOption::setHostTargetMode()
{
#if defined(Q_OS_WIN32)
@@ -242,8 +260,6 @@ 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_cmdArgs;
ProFileOption *m_option;
ProFileParser *m_parser;
ProFileEvaluatorHandler *m_handler;
@@ -1294,9 +1310,9 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProFile(
if (tgt.isEmpty())
tgt.append(ProString(QFileInfo(pro->fileName()).baseName(), NoHash));
if (!m_cmdArgs.isEmpty()) {
if (!m_option->cmdargs.isEmpty()) {
if (ProFile *pro = m_parser->parsedProBlock(
fL1S("(command line)"), m_cmdArgs.join(fL1S("\n")))) {
fL1S("(command line)"), m_option->cmdargs.join(fL1S("\n")))) {
m_locationStack.push(m_current);
visitProBlock(pro, pro->tokPtr());
m_current = m_locationStack.pop();
@@ -3252,22 +3268,4 @@ void ProFileEvaluator::setOutputDir(const QString &dir)
d->m_outputDir = dir;
}
void ProFileEvaluator::setCommandLineArguments(const QStringList &args)
{
d->m_cmdArgs = args;
d->m_option->setHostTargetMode();
bool targetModeSet = false;
for (int i = args.count() - 1; !targetModeSet && i >= 0; --i) {
for (int j = 0; j < ProFileOption::modeMapSize; ++j) {
const ProFileOption::TargetModeMapElement &mapElem = ProFileOption::modeMap[j];
if (args.at(i) == QLatin1String(mapElem.qmakeOption)) {
d->m_option->target_mode = mapElem.targetMode;
targetModeSet = true;
break;
}
}
}
}
QT_END_NAMESPACE