feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix compile with Qt lesser than 5.10

Browse Source 
Broke with 79a43b4d86.

Change-Id: I9e7c9dc02c917b0ec3672b296e673212b16e835d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2018-02-07 07:56:55 +01:00
parent aee0f8efcd
commit 921c4b9aa2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/settingsaccessor.cpp
View File

@@ -676,20 +676,23 @@ bool SettingsAccessor::addVersionUpgrader(std::unique_ptr<VersionUpgrader> 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;
}