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

qmake: Expose qmake arguments as QMAKE_ARGS

Browse Source 
Allows project files or mkspecs to call qmake recursively using system()
with the right arguments, which we use to fix the ios default_post.prf.

Change-Id: I90d69e2b156bb0f0af1279188b11f81c84c24fb8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/1cdbe4752bef972db5471e811e9a781749cd0380)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tor Arne Vestbø
2013-10-23 14:02:59 +02:00
committed by Oswald Buddenhagen
parent 612bc8ef85
commit 561ee92ede
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -975,6 +975,8 @@ void QMakeEvaluator::loadDefaults()
vars[ProKey("_DATE_")] << ProString(QDateTime::currentDateTime().toString());
if (!m_option->qmake_abslocation.isEmpty())
vars[ProKey("QMAKE_QMAKE")] << ProString(m_option->qmake_abslocation);
if (!m_option->qmake_args.isEmpty())
vars[ProKey("QMAKE_ARGS")] = ProStringList(m_option->qmake_args);
#if defined(Q_OS_WIN32)
vars[ProKey("QMAKE_HOST.os")] << ProString("Windows");

1
src/shared/proparser/qmakeglobals.h
View File

@@ -105,6 +105,7 @@ public:
QProcessEnvironment environment;
#endif
QString qmake_abslocation;
QStringList qmake_args;
QString qmakespec, xqmakespec;
QString user_template, user_template_prefix;