diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-12 10:50:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-12 10:50:49 +0200 |
| commit | 5a1a20f2eebd5ebb30f529adcdc7b0320dfb295d (patch) | |
| tree | b76c9650429fd17a6e08dd767ede974c05935f16 /src/plugins/qbsprojectmanager | |
| parent | cdca4bd9df0698417030f6e8e3b845a4eb3f271f (diff) | |
| parent | ada1429594b2dfb24c743f79656f393028d0e340 (diff) | |
| download | qt-creator-5a1a20f2eebd5ebb30f529adcdc7b0320dfb295d.tar.gz | |
Merge remote-tracking branch 'origin/4.3' into 4.4
Change-Id: Ifb1dcc847ba4b32a79b349955fad5207e402cb7b
Diffstat (limited to 'src/plugins/qbsprojectmanager')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanager.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs index fe7108e8c3..c732facdf4 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs @@ -46,6 +46,7 @@ QtcPlugin { cpp.defines: base.concat([ 'QML_BUILD_STATIC_LIB', + 'QBS_ENABLE_PROJECT_FILE_UPDATES', // TODO: Take from installed qbscore module 'QBS_INSTALL_DIR="' + (project.useExternalQbs ? FileInfo.fromWindowsSeparators(project.qbs_install_dir) |