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/library/qmakeglobals.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/library/qmakeglobals.cpp')
| -rw-r--r-- | qmake/library/qmakeglobals.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/qmake/library/qmakeglobals.cpp b/qmake/library/qmakeglobals.cpp index 7a907b7eed2..ac9a0856ff8 100644 --- a/qmake/library/qmakeglobals.cpp +++ b/qmake/library/qmakeglobals.cpp @@ -164,29 +164,28 @@ QMakeGlobals::ArgumentReturn QMakeGlobals::addCommandLineArguments( break; default: if (arg.startsWith(QLatin1Char('-'))) { - if (arg == QLatin1String("-after")) { + if (arg == QLatin1String("-after")) state.after = true; - } else if (arg == QLatin1String("-config")) { + else if (arg == QLatin1String("-config")) argState = ArgConfig; - } else if (arg == QLatin1String("-nocache")) { + else if (arg == QLatin1String("-nocache")) do_cache = false; - } else if (arg == QLatin1String("-cache")) { + else if (arg == QLatin1String("-cache")) argState = ArgCache; - } else if (arg == QLatin1String("-platform") || arg == QLatin1String("-spec")) { + else if (arg == QLatin1String("-platform") || arg == QLatin1String("-spec")) argState = ArgSpec; - } else if (arg == QLatin1String("-xplatform") || arg == QLatin1String("-xspec")) { + else if (arg == QLatin1String("-xplatform") || arg == QLatin1String("-xspec")) argState = ArgXSpec; - } else if (arg == QLatin1String("-template") || arg == QLatin1String("-t")) { + else if (arg == QLatin1String("-template") || arg == QLatin1String("-t")) argState = ArgTmpl; - } else if (arg == QLatin1String("-template_prefix") || arg == QLatin1String("-tp")) { + else if (arg == QLatin1String("-template_prefix") || arg == QLatin1String("-tp")) argState = ArgTmplPfx; - } else if (arg == QLatin1String("-win32")) { + else if (arg == QLatin1String("-win32")) dir_sep = QLatin1Char('\\'); - } else if (arg == QLatin1String("-unix")) { + else if (arg == QLatin1String("-unix")) dir_sep = QLatin1Char('/'); - } else { + else return ArgumentUnknown; - } } else if (arg.contains(QLatin1Char('='))) { if (state.after) state.postcmds << arg; |