Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I8aa48d07067c45c888c73af87314f6a88c2a6e14

1 files changed, 9 insertions, 3 deletions

diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index 7c8f99b93..2404788d3 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -584,16 +584,22 @@ bool registerInternalQtConf()
 #ifdef PYSIDE_QT_CONF_PREFIX
     setupPrefix = QStringLiteral(PYSIDE_QT_CONF_PREFIX);
 #endif
-    QString prefixPath = pysideDir.absoluteFilePath(setupPrefix);
+    const QString prefixPathStr = pysideDir.absoluteFilePath(setupPrefix);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    const QByteArray prefixPath = prefixPathStr.toLocal8Bit();
+#else
+    // PYSIDE-972, QSettings used by QtCore uses Latin1
+    const QByteArray prefixPath = prefixPathStr.toLatin1();
+#endif
 
     // rccData needs to be static, otherwise when it goes out of scope, the Qt resource system
     // will point to invalid memory.
-    static QByteArray rccData = QByteArray("[Paths]\nPrefix = ") + prefixPath.toLocal8Bit()
+    static QByteArray rccData = QByteArrayLiteral("[Paths]\nPrefix = ") + prefixPath
 #ifdef Q_OS_WIN
             // LibraryExecutables needs to point to Prefix instead of ./bin because we don't
             // currently conform to the Qt default directory layout on Windows. This is necessary
             // for QtWebEngineCore to find the location of QtWebEngineProcess.exe.
-            + QByteArray("\nLibraryExecutables = ") + prefixPath.toLocal8Bit()
+            + QByteArray("\nLibraryExecutables = ") + prefixPath
 #endif
             ;
     rccData.append('\n');