diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-02 18:08:19 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 18:41:40 +0100 |
| commit | d5afe6e7e4a9a82d78f0b8c901bbb84f1b08fefc (patch) | |
| tree | 295f7932965a290b6287679b94a37ad327e9fbdf /qmake/project.cpp | |
| parent | 848d3694f6603a5dd90977c0a0d73f7140633f33 (diff) | |
remove bizarre late feeding of user_configs into base_vars
there is no obvious reason why this should happen. if base_vars is used
again, the user configs will be parsed again, too.
Change-Id: Ib56e01a468cdb5e81d610bcaf0163bf730cbae05
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index f8b24bb097..138e2cf350 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1447,13 +1447,6 @@ QMakeProject::read(uchar cmd) if(pfile != "-" && vars["TARGET"].isEmpty()) vars["TARGET"].append(QFileInfo(pfile).baseName()); - 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(" "), base_vars); - } - if(cmd & ReadFeatures) { debug_msg(1, "Processing default_post: %s", vars["CONFIG"].join("::").toLatin1().constData()); doProjectInclude("default_post", IncludeFlagFeature, vars); |