Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp

Change-Id: Ib6dd965a7eb6f59103e276b3407739147ecd37b2

2 files changed, 8 insertions, 4 deletions

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index e713debf5b..bc78f5054b 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -1203,7 +1203,7 @@ void QWindowsNativeFileDialogBase::onSelectionChange()
 {
     const QList<QUrl> current = selectedFiles();
     m_data.setSelectedFiles(current);
-    qDebug() << __FUNCTION__ << current << current.size();
+    qCDebug(lcQpaDialogs) << __FUNCTION__ << current << current.size();
 
     if (current.size() == 1)
         emit currentChanged(current.front());
diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp
index 13ca561d35..1a3ad33322 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