Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I9e7cb1b131b7b216aad8ed1b1536669fd1557c21

4 files changed, 18 insertions, 10 deletions

diff --git a/src/android/java/res/values-id/strings.xml b/src/android/java/res/values-in/strings.xml
index b25f568ee9..b25f568ee9 100644
--- a/src/android/java/res/values-id/strings.xml
+++ b/src/android/java/res/values-in/strings.xml
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index cb4b2f9f91..3ba86063e3 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -362,16 +362,22 @@ void QProcessPrivate::destroyPipe(Q_PIPE pipe[2])
     }
 }
 
+template <class T>
+void deleteWorker(T *&worker)
+{
+    if (!worker)
+        return;
+    worker->stop();
+    worker->deleteLater();
+    worker = nullptr;
+}
+
 void QProcessPrivate::closeChannel(Channel *channel)
 {
-    if (channel == &stdinChannel) {
-        delete stdinChannel.writer;
-        stdinChannel.writer = 0;
-    } else if (channel->reader) {
-        channel->reader->stop();
-        channel->reader->deleteLater();
-        channel->reader = 0;
-    }
+    if (channel == &stdinChannel)
+        deleteWorker(channel->writer);
+    else
+        deleteWorker(channel->reader);
     destroyPipe(channel->pipe);
 }
 
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
index 5e94d1558e..dcf52921aa 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
@@ -48,6 +48,7 @@
 #include <QDBusPendingCallWatcher>
 #include <QDBusPendingReply>
 
+#include <QFile>
 #include <QMetaType>
 #include <QMimeType>
 #include <QMimeDatabase>
@@ -181,10 +182,10 @@ void QXdgDesktopPortalFileDialog::openPortal()
 
     if (d->saveFile) {
         if (!d->directory.isEmpty())
-            options.insert(QLatin1String("current_folder"), d->directory.toLatin1().append('\0'));
+            options.insert(QLatin1String("current_folder"), QFile::encodeName(d->directory).append('\0'));
 
         if (!d->selectedFiles.isEmpty())
-            options.insert(QLatin1String("current_file"), d->selectedFiles.first().toLatin1().append('\0'));
+            options.insert(QLatin1String("current_file"), QFile::encodeName(d->selectedFiles.first()).append('\0'));
     }
 
     // Insert filters
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 84a99c10f3..886f1f75b9 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -104,6 +104,7 @@ static QSet<QByteArray> keywords()
 #endif
 #ifdef Q_OS_OSX
             << "osx"
+            << "macos"
 #endif
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
             << "windows"