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

QbsProjectManager: Fix qbs build against installed qbs

Browse Source 
Change-Id: Icfe86b98ab8162fe613dbf089fec1692c5d3dbea
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2017-07-10 15:32:05 +02:00
parent 6c41fafbb6
commit 3b956976d7
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
View File

@@ -46,6 +46,7 @@ QtcPlugin {
cpp.defines: base.concat([ cpp.defines: base.concat([
'QML_BUILD_STATIC_LIB', 'QML_BUILD_STATIC_LIB',
'QBS_ENABLE_PROJECT_FILE_UPDATES', // TODO: Take from installed qbscore module
'QBS_INSTALL_DIR="' 'QBS_INSTALL_DIR="'
+ (project.useExternalQbs + (project.useExternalQbs
? FileInfo.fromWindowsSeparators(project.qbs_install_dir) ? FileInfo.fromWindowsSeparators(project.qbs_install_dir)