File 0001-If-present-load-qt4.conf-instead-of-qt.con... of Package mingw32-libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-If-present-load-qt4.conf-instead-of-qt.conf-to-avoid-i.patch of Package mingw32-libqt4 (Revision 761a6148cb348c7130091310e9f87f70)

Currently displaying revision 761a6148cb348c7130091310e9f87f70 , Show latest

From 683cd3a01e4df8b3ab3fc1e1913e3c89a9e0a168 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 10 Jul 2017 16:10:41 +0200
Subject: [PATCH] If present load qt4.conf instead of qt.conf to avoid
 interferences with qt.conf installed by Qt5

---
 src/corelib/global/qlibraryinfo.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index aa474a2..20de77e 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -130,6 +130,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
 #endif
             {
                 QDir pwd(QCoreApplication::applicationDirPath());
+                qtconfig = pwd.filePath(QLatin1String("qt4.conf"));
+                if (QFile::exists(qtconfig))
+                    return new QSettings(qtconfig, QSettings::IniFormat);
                 qtconfig = pwd.filePath(QLatin1String("qt.conf"));
 	    }
     }
-- 
1.8.4.5

Places

File 0001-If-present-load-qt4.conf-instead-of-qt.conf-to-avoid-i.patch of Package mingw32-libqt4 (Revision 761a6148cb348c7130091310e9f87f70)

Places