diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-03 20:59:14 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:32 +0200 |
| commit | 031ac3c167d356e9c853f2c8f4331d5a276c6651 (patch) | |
| tree | 21281d900924211797c5559add90a4e5d470a7a3 /qmake | |
| parent | a47c6e5ea02e46eb08a40273ad07efa078bdfc28 (diff) | |
dispose of Option::host_mode
it was used only for determining the path separator, so do that
directly.
the -macx option went bye bye, as it is redundant with -unix now.
Change-Id: Ib8344c042db56e05af75d263447311d4b43a3bf0
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.cpp | 23 | ||||
| -rw-r--r-- | qmake/option.h | 2 |
2 files changed, 4 insertions, 21 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 9be604f944..520b89be28 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -88,7 +88,6 @@ QStringList Option::before_user_vars; QStringList Option::after_user_vars; QString Option::user_template; QString Option::user_template_prefix; -Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE; //QMAKE_*_PROPERTY stuff QStringList Option::prop::properties; @@ -255,12 +254,10 @@ Option::parseCommandLine(int argc, char **argv, int skip) Option::user_template = argv[++x]; } else if(opt == "tp" || opt == "template_prefix") { Option::user_template_prefix = argv[++x]; - } else if(opt == "macx") { - Option::host_mode = HOST_MACX_MODE; } else if(opt == "unix") { - Option::host_mode = HOST_UNIX_MODE; + Option::dir_sep = "/"; } else if(opt == "win32") { - Option::host_mode = HOST_WIN_MODE; + Option::dir_sep = "\\"; } else if(opt == "d") { Option::debug_level++; } else if(opt == "version" || opt == "v" || opt == "-version") { @@ -377,19 +374,14 @@ Option::parseCommandLine(int argc, char **argv, int skip) 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::prf_ext = ".prf"; Option::pro_ext = ".pro"; #ifdef Q_OS_WIN + Option::dir_sep = "\\"; Option::dirlist_sep = ";"; #else + Option::dir_sep = "/"; Option::dirlist_sep = ":"; #endif Option::field_sep = ' '; @@ -520,13 +512,6 @@ Option::init(int argc, char **argv) } } - //defaults for globals - if (Option::host_mode == Option::HOST_WIN_MODE) { - Option::dir_sep = "\\"; - } else { - Option::dir_sep = "/"; - } - return QMAKE_CMDLINE_SUCCESS; } diff --git a/qmake/option.h b/qmake/option.h index 683c10b5f3..32af3a8013 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -168,8 +168,6 @@ struct Option enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO }; static QMAKE_RECURSIVE recursive; static QStringList before_user_vars, after_user_vars; - enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE }; - static HOST_MODE host_mode; static QString user_template, user_template_prefix; //QMAKE_*_PROPERTY options |