From 4350054ab86b03b2a4e6641238b762fd80a3c5dd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 9 Aug 2012 18:54:40 +0200 Subject: 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 --- qmake/option.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qmake/option.h') 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: -- cgit v1.2.3