diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-14 12:20:33 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-01 07:19:24 +0000 |
commit | 40746dae36452398649481fecad9cdc5f25cc80f (patch) | |
tree | c97c73364bdd5dfd3069b7a0b062fcee8ef38182 /src/lib/qtprofilesetup | |
parent | 78e19d1f234bb1ba9957c877e57d128f09d1459a (diff) |
Add support for system-level settings
In addition to the traditional per-user settings, there is now also a
system-wide settings file affecting all users. The file's platform-
specific default location can be overridden at build time.
The qbs-config tool can write these settings via the new --system
option.
[ChangeLog] Introduced the concept of system-level qbs settings
Change-Id: Ie6f675a74e96ce1fa7b2dd0712f6106071e848a6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup')
-rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 055e7c6b1..6d82d50ad 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -582,7 +582,8 @@ static void createModules(Profile &profile, Settings *settings, ? allQt4Modules(qtEnvironment) : allQt5Modules(profile, qtEnvironment); const QString profileBaseDir = QString::fromLatin1("%1/profiles/%2") - .arg(QFileInfo(settings->fileName()).dir().absolutePath(), profile.name()); + .arg(QFileInfo(settings->fileName()).dir().absolutePath(), + profile.name()); const QString qbsQtModuleBaseDir = profileBaseDir + QLatin1String("/modules/Qt"); QStringList allFiles; copyTemplateFile(QLatin1String("QtModule.qbs"), qbsQtModuleBaseDir, profile, qtEnvironment, |