From ab2c61e6384bbb5a0d154caa8f4784f9053147fe Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Mon, 10 Jul 2017 18:28:29 +0200 Subject: If available, use a version-specific qt.conf To enable the current Qt version to use a qt.conf that is independent from the previous version, a file named 'qt.conf' is searched for first. If this file does not exist, a file with the name 'qt.conf' is searched for. Task-number: QTBUG-88635 Change-Id: If75b63f72a7bdbdf1de7729ea4ecb00810b58d12 Reviewed-by: Oswald Buddenhagen --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/corelib/global/qlibraryinfo.cpp') diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 301c3ab89a..bb1eafeccd 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -184,7 +184,7 @@ QSettings *QLibraryInfoPrivate::findConfiguration() { #ifdef QT_BUILD_QMAKE QString qtconfig = qmake_libraryInfoFile(); - if (QFile::exists(qtconfig)) + if (!qtconfig.isEmpty()) return new QSettings(qtconfig, QSettings::IniFormat); #else QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); @@ -207,6 +207,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() #endif if (QCoreApplication::instance()) { QDir pwd(QCoreApplication::applicationDirPath()); + qtconfig = pwd.filePath(QLatin1String("qt" QT_STRINGIFY(QT_VERSION_MAJOR) ".conf")); + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); qtconfig = pwd.filePath(QLatin1String("qt.conf")); if (QFile::exists(qtconfig)) return new QSettings(qtconfig, QSettings::IniFormat); -- cgit v1.2.3