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

Merge remote-tracking branch 'origin/4.3' into master

Browse Source 
Change-Id: I83af635dcac98e4fd78b21d8dd9dc3a27a4fdf94
This commit is contained in:
Orgad Shaneh
2017-06-12 10:00:50 +03:00
parent 1d921ae044 98c35d6cd9
commit 6b0e1bc5f8
24 changed files with 9195 additions and 5567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,6 +180,8 @@ void QbsManager::addQtProfileFromKit(const QString &profileName, const ProjectEx
if (qtEnv.qtConfigItems.contains(buildVariant))
qtEnv.buildVariant << buildVariant;
}
qtEnv.qmlPath = qt->qmakeProperty("QT_INSTALL_QML");
qtEnv.qmlImportPath = qt->qmakeProperty("QT_INSTALL_IMPORTS");
const qbs::ErrorInfo errorInfo = qbs::setupQtProfile(profileName, settings(), qtEnv);
if (errorInfo.hasError()) {
Core::MessageManager::write(tr("Failed to set up kit for Qbs: %1")