1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove bizarre late feeding of user_configs into base_vars

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-02-02 18:08:19 +01:00 committed by Qt by Nokia
parent 848d3694f6
commit d5afe6e7e4
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/project.cpp
View File

@ -1447,13 +1447,6 @@ QMakeProject::read(uchar cmd)
if(pfile != "-" && vars["TARGET"].isEmpty()) if(pfile != "-" && vars["TARGET"].isEmpty())
vars["TARGET"].append(QFileInfo(pfile).baseName()); 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) { if(cmd & ReadFeatures) {
debug_msg(1, "Processing default_post: %s", vars["CONFIG"].join("::").toLatin1().constData()); debug_msg(1, "Processing default_post: %s", vars["CONFIG"].join("::").toLatin1().constData());
doProjectInclude("default_post", IncludeFlagFeature, vars); doProjectInclude("default_post", IncludeFlagFeature, vars);