From a659b4e56be9721389d28e212b4f4bcd393e6410 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 25 Feb 2015 12:14:52 +0100
Subject: fix default of SettingsPath when qt.conf is present

it's documented to fall back to Prefix if qt.conf is present but
Settings is not specified.

Task-number: QTBUG-44644
Change-Id: I8ef6659cbdad51b2fb3c1075ea6f0af4997117ed
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qlibraryinfo.cpp | 4 +++-
 1 file changed, 3 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 d592032c1f..d66007b2b6 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -441,8 +441,10 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
             defaultValue = QLatin1String(qtConfEntries[loc].value);
         }
 #ifndef Q_OS_WIN // On Windows we use the registry
-        else if (loc == SettingsPath)
+        else if (loc == SettingsPath) {
             key = QLatin1String("Settings");
+            defaultValue = QLatin1String(".");
+        }
 #endif
 
         if(!key.isNull()) {
-- 
cgit v1.2.3