diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-16 17:12:53 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 09:39:50 +0200 |
| commit | 0ce1a6ba244c934b5b4504abb980806793d54515 (patch) | |
| tree | 6d361c443dab353a2af8995baf0d1b8caa879b08 /qmake/option.cpp | |
| parent | fc1bca86081dc0698a7dd3f9c955edd194d5a798 (diff) | |
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 <joerg.bornemann@nokia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 73c2e32abc..defe2bff28 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -401,6 +401,13 @@ static QStringList detectShellPath() int Option::init(int argc, char **argv) { +#if defined(Q_OS_MAC) + Option::host_mode = Option::HOST_MACX_MODE; +#elif defined(Q_OS_UNIX) + Option::host_mode = Option::HOST_UNIX_MODE; +#else + Option::host_mode = Option::HOST_WIN_MODE; +#endif Option::application_argv0 = 0; Option::cpp_moc_mod = ""; Option::h_moc_mod = "moc_"; @@ -554,32 +561,24 @@ Option::init(int argc, char **argv) } } else if (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) { #if defined(Q_OS_MAC) - Option::host_mode = Option::HOST_MACX_MODE; Option::target_mode = Option::TARG_MACX_MODE; #elif defined(Q_OS_UNIX) - Option::host_mode = Option::HOST_UNIX_MODE; Option::target_mode = Option::TARG_UNIX_MODE; #else - Option::host_mode = Option::HOST_WIN_MODE; Option::target_mode = Option::TARG_WIN_MODE; #endif } //defaults for globals - if (Option::host_mode != Option::HOST_UNKNOWN_MODE) - applyHostMode(); - return QMAKE_CMDLINE_SUCCESS; -} + if (Option::host_mode == Option::HOST_WIN_MODE) { + Option::dir_sep = "\\"; + Option::obj_ext = ".obj"; + } else { + Option::dir_sep = "/"; + Option::obj_ext = ".o"; + } -void Option::applyHostMode() -{ - if (Option::host_mode == Option::HOST_WIN_MODE) { - Option::dir_sep = "\\"; - Option::obj_ext = ".obj"; - } else { - Option::dir_sep = "/"; - Option::obj_ext = ".o"; - } + return QMAKE_CMDLINE_SUCCESS; } void Option::prepareProject(const QString &pfile) |