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/metamakefile.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/metamakefile.cpp')
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 54ab4759c2..42030507b7 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -514,28 +514,5 @@ MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &na #endif // QT_QMAKE_PARSER_ONLY -bool -MetaMakefileGenerator::modeForGenerator(const QString &gen, Option::TARG_MODE *target_mode) -{ - if (gen == "UNIX") { -#ifdef Q_OS_MAC - *target_mode = Option::TARG_MACX_MODE; -#else - *target_mode = Option::TARG_UNIX_MODE; -#endif - } else if (gen == "MSVC.NET" || gen == "BMAKE" || gen == "MSBUILD") { - *target_mode = Option::TARG_WIN_MODE; - } else if (gen == "MINGW") { - *target_mode = Option::TARG_WIN_MODE; - } else if (gen == "PROJECTBUILDER" || gen == "XCODE") { - *target_mode = Option::TARG_MACX_MODE; - } else if (gen == "GBUILD") { - *target_mode = Option::TARG_UNIX_MODE; - } else { - fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData()); - return false; - } - return true; -} QT_END_NAMESPACE |