From d5afe6e7e4a9a82d78f0b8c901bbb84f1b08fefc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 2 Feb 2012 18:08:19 +0100 Subject: 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 --- qmake/project.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'qmake') 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); -- cgit v1.2.3