File 0001-Use-unix-path-layout-on-Windows-too-to-mat... of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Use-unix-path-layout-on-Windows-too-to-match-Framework.patch of Package mingw32-libqt5-qtbase (Revision 309c38ef491c84b968465a3c931c2a23)

Currently displaying revision 309c38ef491c84b968465a3c931c2a23 , Show latest

From 1dd8c076052b8ea565d0235133c4579cf70f50f9 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 26 Jul 2018 15:23:27 +0200
Subject: [PATCH] Use unix path layout also on Windows to match KDE Frameworks
 build system path style

Change-Id: Ic58f55b94a3457713c637034abdd9d0e88eccf51
---
 src/corelib/io/io.pri                  |  2 +-
 src/corelib/io/qstandardpaths_unix.cpp | 35 ++++++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index b0cac59f42..168658d993 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -123,7 +123,7 @@ win32 {
 
         SOURCES += \
             io/qsettings_win.cpp \
-            io/qstandardpaths_win.cpp \
+            io/qstandardpaths_unix.cpp \
             io/qstorageinfo_win.cpp \
             io/qwindowspipereader.cpp \
             io/qwindowspipewriter.cpp \
diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp
index f0ff46fe7f..c5968e3fa3 100644
--- a/src/corelib/io/qstandardpaths_unix.cpp
+++ b/src/corelib/io/qstandardpaths_unix.cpp
@@ -45,6 +45,7 @@
 #include <private/qfilesystemengine_p.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <qlibraryinfo.h>
 
 #ifndef QT_BOOTSTRAPPED
 #include <qcoreapplication.h>
@@ -117,12 +118,20 @@ QString QStandardPaths::writableLocation(StandardLocation type)
     }
     case RuntimeLocation:
     {
+#ifdef Q_OS_WIN
+        const uint myUid = -2;
+#else
         const uint myUid = uint(geteuid());
+#endif
         // http://standards.freedesktop.org/basedir-spec/latest/
         QFileInfo fileInfo;
         QString xdgRuntimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
         if (xdgRuntimeDir.isEmpty()) {
+#ifdef Q_OS_WIN
+            const QString userName = qgetenv("USERNAME");
+#else
             const QString userName = QFileSystemEngine::resolveUserName(myUid);
+#endif
             xdgRuntimeDir = QDir::tempPath() + QLatin1String("/runtime-") + userName;
             fileInfo.setFile(xdgRuntimeDir);
             if (!fileInfo.isDir()) {
@@ -268,23 +277,32 @@ QString QStandardPaths::writableLocation(StandardLocation type)
 
     return path;
 }
-
+#ifdef Q_OS_WIN
+  #define PathSeparator ';'
+#else
+  #define PathSeparator ':'
+#endif
 static QStringList xdgDataDirs()
 {
     QStringList dirs;
     // http://standards.freedesktop.org/basedir-spec/latest/
     QString xdgDataDirsEnv = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
     if (xdgDataDirsEnv.isEmpty()) {
+#ifdef Q_OS_WIN
+        QString prefix = QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        dirs.append(prefix + QString::fromLatin1("/share"));
+#else
         dirs.append(QString::fromLatin1("/usr/local/share"));
         dirs.append(QString::fromLatin1("/usr/share"));
+#endif
     } else {
-        dirs = xdgDataDirsEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
+        dirs = xdgDataDirsEnv.split(QLatin1Char(PathSeparator), QString::SkipEmptyParts);
 
         // Normalize paths, skip relative paths
         QMutableListIterator<QString> it(dirs);
         while (it.hasNext()) {
             const QString dir = it.next();
-            if (!dir.startsWith(QLatin1Char('/')))
+            if (!QDir::isAbsolutePath(dir))
                 it.remove();
             else
                 it.setValue(QDir::cleanPath(dir));
@@ -306,10 +324,15 @@ static QStringList xdgConfigDirs()
     QStringList dirs;
     // http://standards.freedesktop.org/basedir-spec/latest/
     const QString xdgConfigDirs = QFile::decodeName(qgetenv("XDG_CONFIG_DIRS"));
-    if (xdgConfigDirs.isEmpty())
+    if (xdgConfigDirs.isEmpty()) {
+#ifdef Q_OS_WIN
+        QString prefix = QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        dirs.append(prefix + QString::fromLatin1("/etc/xdg"));
+#else
         dirs.append(QString::fromLatin1("/etc/xdg"));
-    else
-        dirs = xdgConfigDirs.split(QLatin1Char(':'));
+#endif
+    } else
+        dirs = xdgConfigDirs.split(QLatin1Char(PathSeparator));
     return dirs;
 }
 
-- 
2.13.7

Places

File 0001-Use-unix-path-layout-on-Windows-too-to-match-Framework.patch of Package mingw32-libqt5-qtbase (Revision 309c38ef491c84b968465a3c931c2a23)

Places