summaryrefslogtreecommitdiffstats
path: root/src/winmain
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-11 18:01:13 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-11 18:10:41 +0100
commitf4d8cafc1b034f544ca84b849c23ab99bc1600e7 (patch)
treef1150b5aeaec4753f2ddfcd17643666b3a82dd9d /src/winmain
parente5b422382a512a8267a0eb24e6543a8cf84478d9 (diff)
parentb03133231b99922a72831c4ec23faf55516ef404 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: src/3rdparty/harfbuzz-ng/src/hb-private.hh src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/sql/doc/src/sql-driver.qdoc Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598
Diffstat (limited to 'src/winmain')
-rw-r--r--src/winmain/qtmain_winrt.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp
index 1f5b98794d..79ecf30b70 100644
--- a/src/winmain/qtmain_winrt.cpp
+++ b/src/winmain/qtmain_winrt.cpp
@@ -295,11 +295,15 @@ private:
bool develMode = false;
bool debugWait = false;
- for (const char *arg : args) {
- if (strcmp(arg, "-qdevel") == 0)
+ for (int i = args.count() - 1; i >= 0; --i) {
+ const char *arg = args.at(i);
+ if (strcmp(arg, "-qdevel") == 0) {
develMode = true;
- if (strcmp(arg, "-qdebug") == 0)
+ args.remove(i);
+ } else if (strcmp(arg, "-qdebug") == 0) {
debugWait = true;
+ args.remove(i);
+ }
}
if (develMode) {
// Write a PID file to help runner