From 4753958db707001d1e14fa8312708dc1e891bacc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 17 Apr 2012 12:15:39 +0200 Subject: 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 --- qmake/generators/metamakefile.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'qmake/generators/metamakefile.cpp') 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 -- cgit v1.2.3