From 921c4b9aa27f133be1271e1ae69fc7a17c456b7f Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 7 Feb 2018 07:56:55 +0100 Subject: [PATCH] Utils: Fix compile with Qt lesser than 5.10 Broke with 79a43b4d86e0c21a0dfebf4a9baaa5ef03760d33. Change-Id: I9e7c9dc02c917b0ec3672b296e673212b16e835d Reviewed-by: Eike Ziller --- src/libs/utils/settingsaccessor.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index f867b22f299..d02aab782b9 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -676,20 +676,23 @@ bool SettingsAccessor::addVersionUpgrader(std::unique_ptr upgra FileName SettingsAccessor::projectUserFile() const { + static const QString qtcExt = QLatin1String(qgetenv("QTC_EXTENSION")); FileName projectUserFile = d->m_projectFilePath; - projectUserFile.appendString(generateSuffix(qEnvironmentVariable("QTC_EXTENSION", ".user"))); + projectUserFile.appendString(generateSuffix(qtcExt.isEmpty() ? ".user" : qtcExt)); return projectUserFile; } FileName SettingsAccessor::externalUserFile() const { - return externalUserFilePath(d->m_projectFilePath, generateSuffix(qEnvironmentVariable("QTC_EXTENSION", ".user"))); + static const QString qtcExt = QLatin1String(qgetenv("QTC_EXTENSION")); + return externalUserFilePath(d->m_projectFilePath, generateSuffix(qtcExt.isEmpty() ? ".user" : qtcExt)); } FileName SettingsAccessor::sharedFile() const { + static const QString qtcExt = QLatin1String(qgetenv("QTC_SHARED_EXTENSION")); FileName sharedFile = d->m_projectFilePath; - sharedFile.appendString(generateSuffix(qEnvironmentVariable("QTC_SHARED_EXTENSION", ".shared"))); + sharedFile.appendString(generateSuffix(qtcExt.isEmpty() ? ".shared" : qtcExt)); return sharedFile; }