diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-09 18:54:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 23:12:23 +0200 |
| commit | 4350054ab86b03b2a4e6641238b762fd80a3c5dd (patch) | |
| tree | a0a77728895ebbb046782558a721fc7019d00c29 /qmake/option.h | |
| parent | 1447b6c55b55ca7bd6474524c12948c3e5589d2e (diff) | |
revamp preparation of command line for qmake calls in makefiles
instead of re-assembling a list from the variables, take the original
command line minus some explicitly stripped out options. this is way
less code and poses no synchronization problem between the two parts.
as a "side effect", variables obtained from $QMAKEFLAGS won't multiply
with each makefile nesting level, as the generated command line won't
replicate data obtained from the environment.
Change-Id: I5d1ce0f11efb338f60405529f9818910103b1b0e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/option.h b/qmake/option.h index 0b3fe2dd8f..cab8426db0 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -161,6 +161,7 @@ struct Option //all modes static QString qmake_abslocation; + static QStringList qmake_args; static QFile output; static QString output_dir; static int debug_level; @@ -195,8 +196,6 @@ struct Option static QString cachefile; static int cachefile_depth; static QStringList project_files; - static QString qmakespec_commandline; - static QString xqmakespec_commandline; }; private: |