1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dispose of Option::host_mode

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-05-03 20:59:14 +02:00
parent a47c6e5ea0
commit 031ac3c167
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qmake/option.cpp
View File

@ -88,7 +88,6 @@ QStringList Option::before_user_vars;
QStringList Option::after_user_vars; QStringList Option::after_user_vars;
QString Option::user_template; QString Option::user_template;
QString Option::user_template_prefix; QString Option::user_template_prefix;
Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE;
//QMAKE_*_PROPERTY stuff //QMAKE_*_PROPERTY stuff
QStringList Option::prop::properties; QStringList Option::prop::properties;
@ -255,12 +254,10 @@ Option::parseCommandLine(int argc, char **argv, int skip)
Option::user_template = argv[++x]; Option::user_template = argv[++x];
} else if(opt == "tp" || opt == "template_prefix") { } else if(opt == "tp" || opt == "template_prefix") {
Option::user_template_prefix = argv[++x]; Option::user_template_prefix = argv[++x];
} else if(opt == "macx") {
Option::host_mode = HOST_MACX_MODE;
} else if(opt == "unix") { } else if(opt == "unix") {
Option::host_mode = HOST_UNIX_MODE; Option::dir_sep = "/";
} else if(opt == "win32") { } else if(opt == "win32") {
Option::host_mode = HOST_WIN_MODE; Option::dir_sep = "\\";
} else if(opt == "d") { } else if(opt == "d") {
Option::debug_level++; Option::debug_level++;
} else if(opt == "version" || opt == "v" || opt == "-version") { } else if(opt == "version" || opt == "v" || opt == "-version") {
@ -377,19 +374,14 @@ Option::parseCommandLine(int argc, char **argv, int skip)
int int
Option::init(int argc, char **argv) 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::application_argv0 = 0;
Option::prf_ext = ".prf"; Option::prf_ext = ".prf";
Option::pro_ext = ".pro"; Option::pro_ext = ".pro";
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
Option::dir_sep = "\\";
Option::dirlist_sep = ";"; Option::dirlist_sep = ";";
#else #else
Option::dir_sep = "/";
Option::dirlist_sep = ":"; Option::dirlist_sep = ":";
#endif #endif
Option::field_sep = ' '; 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; return QMAKE_CMDLINE_SUCCESS;
} }

2
qmake/option.h
View File

@ -168,8 +168,6 @@ struct Option
enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO }; enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO };
static QMAKE_RECURSIVE recursive; static QMAKE_RECURSIVE recursive;
static QStringList before_user_vars, after_user_vars; 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; static QString user_template, user_template_prefix;
//QMAKE_*_PROPERTY options //QMAKE_*_PROPERTY options