File 0001-add-qtconf-settings.patch of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-add-qtconf-settings.patch of Package mingw32-libqt5-qtbase (Revision 4f12472f9e923c6b48335f6dfb1a8845)

Currently displaying revision 4f12472f9e923c6b48335f6dfb1a8845 , Show latest

--- a/src/corelib/global/qlibraryinfo.cpp	2020-08-18 00:46:16.109553534 +0200
+++ b/src/corelib/global/qlibraryinfo.cpp	2020-08-18 00:50:58.167332599 +0200
@@ -122,6 +123,13 @@
         }
     }
 };
+
+QSettings* qt_conf_settings();
+
+QSettings* qt_conf_settings()
+{
+    return QLibraryInfoPrivate::configuration();
+}
 
 static const char platformsSection[] = "Platforms";
 
--- a/src/corelib/io/qstandardpaths_unix.cpp	2020-08-18 00:53:09.214300341 +0200
+++ b/src/corelib/io/qstandardpaths_unix.cpp	2020-08-18 01:04:58.824700817 +0200
@@ -55,8 +55,20 @@
 
 #ifndef QT_NO_STANDARDPATHS
 
+#include <qsettings.h>
+
 QT_BEGIN_NAMESPACE
 
+QSettings *qt_conf_settings();
+
+static QByteArray _mygetenv(const char *varName)
+{
+    static QSettings *qt_conf = qt_conf_settings();
+    return qt_conf ? qt_conf->value(QString(QLatin1String("StandardPaths/%1")).arg(QLatin1String(varName)), qgetenv(varName)).toByteArray() : qgetenv(varName);
+}
+
+#define qgetenv _mygetenv
+
 static void appendOrganizationAndApp(QString &path)
 {
 #ifndef QT_BOOTSTRAPPED

Places

File 0001-add-qtconf-settings.patch of Package mingw32-libqt5-qtbase (Revision 4f12472f9e923c6b48335f6dfb1a8845)

Places