summaryrefslogtreecommitdiffstats
path: root/qmake/option.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-10-23 14:02:59 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-24 20:20:59 +0200
commit1cdbe4752bef972db5471e811e9a781749cd0380 (patch)
tree63aea5a8b2c449e42994d0895a8b461042107906 /qmake/option.cpp
parentc584f3d9a8e9dec113d9036729a6fbee77d4976f (diff)
qmake: Expose qmake arguments as QMAKE_ARGS
Allows project files or mkspecs to call qmake recursively using system() with the right arguments, which we use to fix the ios default_post.prf. Change-Id: I90d69e2b156bb0f0af1279188b11f81c84c24fb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/option.cpp')
-rw-r--r--qmake/option.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index da52542a7d..86d55835f8 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -82,7 +82,6 @@ char Option::field_sep;
Option::QMAKE_MODE Option::qmake_mode = Option::QMAKE_GENERATE_NOTHING;
//all modes
-QStringList Option::qmake_args;
int Option::warn_level = WarnLogic | WarnDeprecated;
int Option::debug_level = 0;
QFile Option::output;
@@ -436,7 +435,7 @@ Option::init(int argc, char **argv)
return ret;
//return ret == QMAKE_CMDLINE_SHOW_USAGE ? usage(argv[0]) : false;
}
- Option::qmake_args = args;
+ globals->qmake_args = args;
}
globals->commitCommandLineArguments(cmdstate);
globals->debugLevel = Option::debug_level;