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

qbsprojectmanager: fix mkspecPath in profile

Browse Source 
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>
This commit is contained in:
Joerg Bornemann
2013-05-14 17:39:05 +02:00
committed by Tobias Hunger
parent 4ec7c2ea6e
commit 3604bdbad2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
View File

@@ -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());