diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-02 19:31:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 21:33:08 +0100 |
| commit | c679b2f0a65a630f7490b37529e2186a8cd9c78b (patch) | |
| tree | 3b5d155b51d0ff975fde021e48aa658a315b207a /qmake/option.cpp | |
| parent | a30074bab8446640d41060637b99394136bea7d7 (diff) | |
get rid of Option::user_configs
merge them into before_user_vars. they are evaluated right after another
anyway.
Change-Id: I11859284b363fee01233f6e20989444fef711d0d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index c73eb149ec..cf72351f1f 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -91,7 +91,6 @@ QString Option::output_dir; Option::QMAKE_RECURSIVE Option::recursive = Option::QMAKE_RECURSIVE_DEFAULT; QStringList Option::before_user_vars; QStringList Option::after_user_vars; -QStringList Option::user_configs; QString Option::user_template; QString Option::user_template_prefix; QStringList Option::shellPath; @@ -219,6 +218,8 @@ bool usage(const char *a0) int Option::parseCommandLine(int argc, char **argv, int skip) { + QStringList user_configs; + bool before = true; for(int x = skip; x < argc; x++) { if(*argv[x] == '-' && strlen(argv[x]) > 1) { /* options */ @@ -303,7 +304,7 @@ Option::parseCommandLine(int argc, char **argv, int skip) } else if(opt == "nr" || opt == "norecursive") { Option::recursive = Option::QMAKE_RECURSIVE_NO; } else if(opt == "config") { - Option::user_configs += argv[++x]; + user_configs += argv[++x]; } else { if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || Option::qmake_mode == Option::QMAKE_GENERATE_PRL) { @@ -376,6 +377,9 @@ Option::parseCommandLine(int argc, char **argv, int skip) } } + if (!user_configs.isEmpty()) + Option::before_user_vars += "CONFIG += " + user_configs.join(" "); + return Option::QMAKE_CMDLINE_SUCCESS; } |