diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-17 12:15:39 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 09:39:50 +0200 |
commit | 4753958db707001d1e14fa8312708dc1e891bacc (patch) | |
tree | a08250cc5e1c79fd2c8622dd42dbaff8b114bb4e /qmake/generators/makefile.cpp | |
parent | 777fa561ab3af83ac78dbe55a22ae28097f0dfbd (diff) |
revamp handling of qmake target mode
the project evaluator becomes oblivious of the target mode.
the mode is set up in spec_post.prf according to the spec.
$$QMAKE_TARGET contains the feature suffixes to search, and is also
contained in $$CONFIG.
the target_mode variable itself becomes private to the Makefile class.
Change-Id: I3c06d9dab536b753343cec6c5c491d3203e50bd8
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r-- | qmake/generators/makefile.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 2a21aa9880..f187190ac7 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -300,6 +300,12 @@ MakefileGenerator::setProjectFile(QMakeProject *p) if(project) return; project = p; + if (project->isActiveConfig("win32")) + target_mode = TARG_WIN_MODE; + else if (project->isActiveConfig("macx")) + target_mode = TARG_MACX_MODE; + else + target_mode = TARG_UNIX_MODE; init(); findLibraries(); if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE && @@ -3253,7 +3259,7 @@ MakefileGenerator::writePkgConfigFile() t << "Libs: "; QString pkgConfiglibDir; QString pkgConfiglibName; - if (Option::target_mode == Option::TARG_MACX_MODE && project->isActiveConfig("lib_bundle")) { + if (target_mode == TARG_MACX_MODE && project->isActiveConfig("lib_bundle")) { pkgConfiglibDir = "-F${libdir}"; QString bundle; if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) |