From 0ce1a6ba244c934b5b4504abb980806793d54515 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 16 Apr 2012 17:12:53 +0200 Subject: don't let the make spec determine the host mode any more (some of) the generators are (moderately) x-platform, so it makes no sense to nail the host platform to a generator (and thus a spec). overriding the host platform is only a debugging mesasure anyway, so one can use the (now undocumented) -unix/-macx/-win32 options for that. Change-Id: If2a059f1feeb2c726e5838625ede1c7add829985 Reviewed-by: Joerg Bornemann Reviewed-by: Mark Brand --- qmake/generators/metamakefile.cpp | 18 +----------------- qmake/generators/metamakefile.h | 3 +-- 2 files changed, 2 insertions(+), 19 deletions(-) (limited to 'qmake/generators') diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index a1ab4ada75..3243aebb3b 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -515,37 +515,21 @@ MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &na #endif // QT_QMAKE_PARSER_ONLY bool -MetaMakefileGenerator::modesForGenerator(const QString &gen, - Option::HOST_MODE *host_mode, Option::TARG_MODE *target_mode) +MetaMakefileGenerator::modeForGenerator(const QString &gen, Option::TARG_MODE *target_mode) { if (gen == "UNIX") { #ifdef Q_OS_MAC - *host_mode = Option::HOST_MACX_MODE; *target_mode = Option::TARG_MACX_MODE; -#elif defined(Q_OS_WIN) - *host_mode = Option::HOST_WIN_MODE; - *target_mode = Option::TARG_UNIX_MODE; #else - *host_mode = Option::HOST_UNIX_MODE; *target_mode = Option::TARG_UNIX_MODE; #endif } else if (gen == "MSVC.NET" || gen == "BMAKE" || gen == "MSBUILD") { - *host_mode = Option::HOST_WIN_MODE; *target_mode = Option::TARG_WIN_MODE; } else if (gen == "MINGW") { -#if defined(Q_OS_MAC) - *host_mode = Option::HOST_MACX_MODE; -#elif defined(Q_OS_UNIX) - *host_mode = Option::HOST_UNIX_MODE; -#else - *host_mode = Option::HOST_WIN_MODE; -#endif *target_mode = Option::TARG_WIN_MODE; } else if (gen == "PROJECTBUILDER" || gen == "XCODE") { - *host_mode = Option::HOST_MACX_MODE; *target_mode = Option::TARG_MACX_MODE; } else if (gen == "GBUILD") { - *host_mode = Option::HOST_UNIX_MODE; *target_mode = Option::TARG_INTEGRITY_MODE; } else { fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData()); diff --git a/qmake/generators/metamakefile.h b/qmake/generators/metamakefile.h index 4e2e7c502e..a6889fd6cd 100644 --- a/qmake/generators/metamakefile.h +++ b/qmake/generators/metamakefile.h @@ -67,8 +67,7 @@ public: static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true, bool *success = 0); static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false); - static bool modesForGenerator(const QString &generator, - Option::HOST_MODE *host_mode, Option::TARG_MODE *target_mode); + static bool modeForGenerator(const QString &generator, Option::TARG_MODE *target_mode); inline QMakeProject *projectFile() const { return project; } -- cgit v1.2.3