diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
commit | 92c998afb66a2ec900d50cab57929c0a97ad46ac (patch) | |
tree | 1f6219dc64c236c85d7365f8e07ee1df1f27a610 /qmake | |
parent | 6c4dec7bff6f55b0c41729f4a4ab6962a037af15 (diff) | |
parent | 6f4212e5936b96a8be0eacddbfc4dd7ca5abd776 (diff) |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h
Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/project.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index cb4117bef4..bbfd9005c6 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1382,16 +1382,15 @@ QMakeProject::read(uchar cmd) read(Option::mkfile::cachefile, base_vars); } } - - if(cmd & ReadFeatures) { - debug_msg(1, "Processing default_pre: %s", vars["CONFIG"].join("::").toLatin1().constData()); - if(doProjectInclude("default_pre", IncludeFlagFeature, base_vars) == IncludeNoExist) - doProjectInclude("default", IncludeFlagFeature, base_vars); - } } vars = base_vars; // start with the base + if(cmd & ReadFeatures) { + debug_msg(1, "Processing default_pre: %s", vars["CONFIG"].join("::").toLatin1().constData()); + doProjectInclude("default_pre", IncludeFlagFeature, vars); + } + //get a default if(pfile != "-" && vars["TARGET"].isEmpty()) vars["TARGET"].append(QFileInfo(pfile).baseName()); |