diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-05-14 17:39:05 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-15 10:35:03 +0200 |
| commit | 3604bdbad29ba539bda5a4ac355838fd8554888f (patch) | |
| tree | 9193cfa6f68ae68698952fa796369563f4f2b804 | |
| parent | 4ec7c2ea6ef89e05f3a6644a15388549bc029867 (diff) | |
| download | qt-creator-3604bdbad29ba539bda5a4ac355838fd8554888f.tar.gz | |
qbsprojectmanager: fix mkspecPath in profile
qbs.mkspecPath contains the full path to the mkspec,
not the directory containing all mkspecs.
Change-Id: I9407057eff0c587bcc44d393bf4eede1d4263d65
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index b5958cce96..21b8ce768a 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -205,7 +205,9 @@ void QbsManager::addProfileFromKit(const ProjectExplorer::Kit *k) data.insert(QLatin1String(QTCORE_BINPATH), qt->binPath().toUserOutput()); data.insert(QLatin1String(QTCORE_INCPATH), qt->headerPath().toUserOutput()); data.insert(QLatin1String(QTCORE_LIBPATH), qt->libraryPath().toUserOutput()); - data.insert(QLatin1String(QTCORE_MKSPEC), qt->mkspecsPath().toUserOutput()); + Utils::FileName mkspecPath = qt->mkspecsPath(); + mkspecPath.appendPath(qt->mkspec().toString()); + data.insert(QLatin1String(QTCORE_MKSPEC), mkspecPath.toUserOutput()); data.insert(QLatin1String(QTCORE_NAMESPACE), qt->qtNamespace()); data.insert(QLatin1String(QTCORE_LIBINFIX), qt->qtLibInfix()); data.insert(QLatin1String(QTCORE_VERSION), qt->qtVersionString()); |