From a3f639017d9077d22becbc6ac583c922959287e5 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 10 Jan 2022 22:16:19 +0100 Subject: Fix wrong QT_HOST_* values when qt.conf is present When a qt.conf was present, QT_HOST_* variables got a wrong default value. For example, QT_HOST_BINS would end with /bin/bin. We must not provide the defaults via QSettings::value(_, defaultValue). The assignment of the default value is done in QMakeLibraryInfo::rawLocation() separately after retrieving the value. This amends commit 04ec14105ec41a67fe4d53a1962c9d68c5fd8715. Fixes: QTBUG-99656 Change-Id: I43431664e93ab40417a5432b03e7eb38ae21bad8 Reviewed-by: Alexey Edelev (cherry picked from commit 9d15854138b72be25f4584144eee8f4c0bf8117a) Reviewed-by: Qt Cherry-pick Bot --- qmake/qmakelibraryinfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/qmakelibraryinfo.cpp b/qmake/qmakelibraryinfo.cpp index 59a4e6eb59..45c74c25ad 100644 --- a/qmake/qmakelibraryinfo.cpp +++ b/qmake/qmakelibraryinfo.cpp @@ -223,11 +223,11 @@ QString QMakeLibraryInfo::rawLocation(int loc, QMakeLibraryInfo::PathGroup group : "Paths")); if (locinfo.fallbackKey.isNull()) { - ret = config->value(locinfo.key, locinfo.defaultValue).toString(); + ret = config->value(locinfo.key).toString(); } else { QVariant v = config->value(locinfo.key); if (!v.isValid()) - v = config->value(locinfo.fallbackKey, locinfo.defaultValue); + v = config->value(locinfo.fallbackKey); ret = v.toString(); } -- cgit v1.2.3