3 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 0ae41cc48e..7b05a52caf 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -123,8 +123,8 @@ void QLibrarySettings::load()
 
 static QSettings *findConfiguration()
 {
-    if (!QLibraryInfoPrivate::qtconfManualPath.isEmpty())
-        return new QSettings(QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat);
+    if (QLibraryInfoPrivate::qtconfManualPath)
+        return new QSettings(*QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat);
 
     QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
     if (QFile::exists(qtconfig))
@@ -156,7 +156,7 @@ static QSettings *findConfiguration()
     return nullptr;     //no luck
 }
 
-QString QLibraryInfoPrivate::qtconfManualPath;
+const QString *QLibraryInfoPrivate::qtconfManualPath = nullptr;
 
 QSettings *QLibraryInfoPrivate::configuration()
 {
diff --git a/src/corelib/global/qlibraryinfo_p.h b/src/corelib/global/qlibraryinfo_p.h
index caed0feb84..f335c0d01a 100644
--- a/src/corelib/global/qlibraryinfo_p.h
+++ b/src/corelib/global/qlibraryinfo_p.h
@@ -67,7 +67,7 @@ public:
 #if QT_CONFIG(settings)
     static QSettings *configuration();
     static void reload();
-    static QString qtconfManualPath;
+    static const QString *qtconfManualPath;
 #endif
 
     struct LocationInfo
diff --git a/src/tools/qtpaths/qtpaths.cpp b/src/tools/qtpaths/qtpaths.cpp
index 667b594b67..6e57ce9d4a 100644
--- a/src/tools/qtpaths/qtpaths.cpp
+++ b/src/tools/qtpaths/qtpaths.cpp
@@ -168,6 +168,7 @@ static QString searchStringOrError(QCommandLineParser *parser)
 
 int main(int argc, char **argv)
 {
+    QString qtconfManualPath;
     QCoreApplication app(argc, argv);
     app.setApplicationVersion(QTPATHS_VERSION_STR);
 
@@ -265,7 +266,8 @@ int main(int argc, char **argv)
 
 #if QT_CONFIG(settings)
     if (parser.isSet(qtconf)) {
-        QLibraryInfoPrivate::qtconfManualPath = parser.value(qtconf);
+        qtconfManualPath = parser.value(qtconf);
+        QLibraryInfoPrivate::qtconfManualPath = &qtconfManualPath;
     }
 #endif