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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: I04d9cc69a07d4d07b1bf1df57681d6a68587d7ba
This commit is contained in:
Eike Ziller
2020-03-06 09:44:11 +01:00
parent e5f4cfbeb8 8bb3b3c4f1
commit 8f89c9a846
74 changed files with 536 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qbsprojectmanager/qbssettings.cpp
View File

@@ -117,8 +117,9 @@ void QbsSettings::loadSettings()
{
QSettings * const s = Core::ICore::settings();
m_settings.qbsExecutableFilePath = FilePath::fromString(s->value(QBS_EXE_KEY).toString());
m_settings.defaultInstallDirTemplate = s->value(QBS_DEFAULT_INSTALL_DIR_KEY,
"%{CurrentBuild:QbsBuildRoot}").toString();
m_settings.defaultInstallDirTemplate = s->value(
QBS_DEFAULT_INSTALL_DIR_KEY,
"%{CurrentBuild:QbsBuildRoot}/install-root").toString();
m_settings.useCreatorSettings = s->value(USE_CREATOR_SETTINGS_KEY, true).toBool();
}