diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 14:38:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 14:38:07 +0100 |
| commit | 49a2ec05b43b49d06dba8c6909c9df8d308e127d (patch) | |
| tree | 46d596c4c0e184aab0d4698f05247d1ed13c7e9a /qmake/option.cpp | |
| parent | b86106387350f673a20d3b0a2413023f6205169b (diff) | |
| parent | 31c5b34e808db102bfc5364405711ec94fe51f0a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/qnx/qqnxscreen.cpp
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index fdf11d9266..983d3490d8 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -57,7 +57,6 @@ ProFileCache *Option::proFileCache; QMakeParser *Option::parser; //convenience -const char *Option::application_argv0 = 0; QString Option::prf_ext; QString Option::prl_ext; QString Option::libtool_ext; @@ -318,13 +317,11 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) int Option::init(int argc, char **argv) { - Option::application_argv0 = 0; Option::prf_ext = ".prf"; Option::pro_ext = ".pro"; Option::field_sep = ' '; if(argc && argv) { - Option::application_argv0 = argv[0]; QString argv0 = argv[0]; if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING) Option::qmake_mode = default_mode(argv0); |