diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-13 11:58:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-14 14:24:57 +0100 |
| commit | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch) | |
| tree | 8965835c375422d63b2ccfa927b31a56e64bda1d /qmake/option.cpp | |
| parent | d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff) | |
| parent | e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/concurrent/doc/qtconcurrent.qdocconf
src/corelib/doc/qtcore.qdocconf
src/corelib/global/qglobal.h
src/dbus/doc/qtdbus.qdocconf
src/dbus/qdbusmessage.h
src/gui/doc/qtgui.qdocconf
src/gui/image/qimagereader.cpp
src/network/doc/qtnetwork.qdocconf
src/opengl/doc/qtopengl.qdocconf
src/opengl/qgl.h
src/plugins/platforms/windows/qwindowswindow.cpp
src/printsupport/doc/qtprintsupport.qdocconf
src/sql/doc/qtsql.qdocconf
src/testlib/doc/qttestlib.qdocconf
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
src/widgets/doc/qtwidgets.qdocconf
src/xml/doc/qtxml.qdocconf
Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 7d169492428..fdf11d92661 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -193,9 +193,8 @@ bool usage(const char *a0) } int -Option::parseCommandLine(QStringList &args) +Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) { - QMakeCmdLineParserState state(QDir::currentPath()); enum { ArgNone, ArgOutput } argState = ArgNone; int x = 0; while (x < args.count()) { @@ -313,8 +312,6 @@ Option::parseCommandLine(QStringList &args) fprintf(stderr, "***Option %s requires a parameter\n", qPrintable(args.at(x - 1))); return Option::QMAKE_CMDLINE_SHOW_USAGE | Option::QMAKE_CMDLINE_ERROR; } - globals->commitCommandLineArguments(state); - globals->debugLevel = Option::debug_level; return Option::QMAKE_CMDLINE_SUCCESS; } @@ -374,6 +371,7 @@ Option::init(int argc, char **argv) Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE; } + QMakeCmdLineParserState cmdstate(QDir::currentPath()); const QByteArray envflags = qgetenv("QMAKEFLAGS"); if (!envflags.isNull()) { QStringList args; @@ -399,7 +397,8 @@ Option::init(int argc, char **argv) } if (hasWord) args << QString::fromLocal8Bit(buf); - parseCommandLine(args); + parseCommandLine(args, cmdstate); + cmdstate.flush(); } if(argc && argv) { QStringList args; @@ -430,7 +429,7 @@ Option::init(int argc, char **argv) break; } - int ret = parseCommandLine(args); + int ret = parseCommandLine(args, cmdstate); if(ret != Option::QMAKE_CMDLINE_SUCCESS) { if ((ret & Option::QMAKE_CMDLINE_SHOW_USAGE) != 0) usage(argv[0]); @@ -439,6 +438,8 @@ Option::init(int argc, char **argv) } Option::qmake_args = args; } + globals->commitCommandLineArguments(cmdstate); + globals->debugLevel = Option::debug_level; //last chance for defaults if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || |