aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qtcreator.pro2
m---------src/shared/qbs0
-rw-r--r--src/src.qbs1
3 files changed, 2 insertions, 1 deletions
diff --git a/qtcreator.pro b/qtcreator.pro
index ad7b7d763c..5d22eb0409 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -65,7 +65,7 @@ minQtVersion(5, 0, 0):exists(src/shared/qbs/qbs.pro) {
cache(QBS_RELATIVE_PLUGINS_PATH)
QBS_RELATIVE_SEARCH_PATH = $$relative_path($$QBS_RESOURCES_BUILD_DIR, $$QBS_APPS_DESTDIR)
cache(QBS_RELATIVE_SEARCH_PATH)
- QBS_CONFIG_ADDITION = qbs_no_dev_install
+ QBS_CONFIG_ADDITION = qbs_no_dev_install qbs_enable_project_file_updates
cache(CONFIG, add, QBS_CONFIG_ADDITION)
}
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 4d0a76fafebf11af4ab948e60f9f8eae7097fca
+Subproject c1767ae75e098ae224337cc2b8bd886be54c2e8
diff --git a/src/src.qbs b/src/src.qbs
index 3680e8d006..08562c12fb 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -23,6 +23,7 @@ Project {
condition: qbsSubModuleExists && !useExternalQbs
property bool enableUnitTests: false
+ property bool enableProjectFileUpdates: true
property bool installApiHeaders: false
property string libInstallDir: project.ide_library_path
property stringList libRPaths: qbs.targetOS.contains("osx")