summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-17 11:53:04 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-27 09:39:50 +0200
commit757cad45d7f51661acbdc510630fb3e817d033a1 (patch)
tree114ee79373aa9b28588d5f676961062143d2b7f1
parent0ce1a6ba244c934b5b4504abb980806793d54515 (diff)
purge the integrity target mode
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>
-rw-r--r--qmake/generators/metamakefile.cpp2
-rw-r--r--qmake/option.cpp2
-rw-r--r--qmake/option.h3
3 files changed, 2 insertions, 5 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 3243aebb3b..54ab4759c2 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -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;
diff --git a/qmake/option.cpp b/qmake/option.cpp
index defe2bff28..4d97d4d1dd 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -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") {
diff --git a/qmake/option.h b/qmake/option.h
index 10d696ec68..09922e9c00 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -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;