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

Change-Id: Ifb1dcc847ba4b32a79b349955fad5207e402cb7b
2017-07-12 10:50:49 +02:00
parent cdca4bd9df ada1429594
commit 5a1a20f2ee
8 changed files with 27 additions and 4 deletions
--- 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)