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

purge the integrity target mode

Browse Source 
it wasn't really wired, so the only effect it had was disabling the unix
scopes (despite an attempt to override that in the spec, which probably
worked before qt 4.6, and will start working again soon).

Change-Id: I95daff75b508edaf83a8a06fd327350acd62b124
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Oswald Buddenhagen 2012-04-17 11:53:04 +02:00
parent 0ce1a6ba24
commit 757cad45d7
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/metamakefile.cpp
View File

@ -530,7 +530,7 @@ MetaMakefileGenerator::modeForGenerator(const QString &gen, Option::TARG_MODE *t
} else if (gen == "PROJECTBUILDER" || gen == "XCODE") {
*target_mode = Option::TARG_MACX_MODE;
} else if (gen == "GBUILD") {
*target_mode = Option::TARG_INTEGRITY_MODE;
*target_mode = Option::TARG_UNIX_MODE;
} else {
fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
return false;

2
qmake/option.cpp
View File

@ -266,8 +266,6 @@ Option::parseCommandLine(int argc, char **argv, int skip)
Option::host_mode = HOST_UNIX_MODE;
} else if(opt == "win32") {
Option::host_mode = HOST_WIN_MODE;
} else if(opt == "integrity") {
Option::target_mode = TARG_INTEGRITY_MODE;
} else if(opt == "d") {
Option::debug_level++;
} else if(opt == "version" || opt == "v" || opt == "-version") {

3
qmake/option.h
View File

@ -173,8 +173,7 @@ struct Option
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;
enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE,
TARG_INTEGRITY_MODE };
enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE };
static TARG_MODE target_mode;
static QString user_template, user_template_prefix;
static QStringList shellPath;