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/project.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/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 7a5c953f02..34e443f5c5 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1321,14 +1321,6 @@ QMakeProject::read(uchar cmd) } } - //commandline configs - if ((cmd & ReadSetup) && !Option::user_configs.isEmpty()) { - parser.file = "(configs)"; - parser.from_file = false; - parser.line_no = 1; //really arg count now.. duh - parse("CONFIG += " + Option::user_configs.join(" "), vars); - } - // After user configs, to override them if (!extra_configs.isEmpty()) { parser.file = "(extra configs)"; |