aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup/qtprofilesetup.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-05-15 11:09:16 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-08-24 09:00:14 +0000
commit2385d2b6d2b46fb730f6636d3af478b83b7b43a2 (patch)
tree2090cf137c9703e9f6bbec948a8662cb480a723b /src/lib/qtprofilesetup/qtprofilesetup.cpp
parent8a9f0ba2957ee4f56505b3f3709993d5bbb3f33c (diff)
Have one instance of qbs settings per qbs version.
So that one can switch between versions without having to regenerate profiles every time due to possible incompatibilities. Note: We do not try to magically make old settings work with new versions; if incompatible changes have happened, users still need to re- run tools like setup-toolchains or setup-qt once. Task-number: QBS-527 Change-Id: If8d0015e849ad573a0ed79f624bcd60731244e03 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/lib/qtprofilesetup/qtprofilesetup.cpp')
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index d1fae1a09..40592ac66 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -194,7 +194,7 @@ static void createModules(Profile &profile, Settings *settings,
const QList<QtModuleInfo> modules = qtEnvironment.qtMajorVersion < 5
? allQt4Modules(qtEnvironment)
: allQt5Modules(profile, qtEnvironment);
- const QString profileBaseDir = QString::fromLocal8Bit("%1/qbs/profiles/%2")
+ const QString profileBaseDir = QString::fromLocal8Bit("%1/profiles/%2")
.arg(QFileInfo(settings->fileName()).dir().absolutePath(), profile.name());
const QString qbsQtModuleBaseDir = profileBaseDir + QLatin1String("/modules/Qt");
QStringList allFiles;