Commit 5a16eaca authored by Christian Kandeler's avatar Christian Kandeler

Update qbs submodule.

And do the necessary adaptations.

Change-Id: I35b5c3e02a7265bdc9730154d6d1aa6b19371310
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 06dc8140
......@@ -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)
}
......
Subproject commit 4d0a76fafebf11af4ab948e60f9f8eae7097fca8
Subproject commit c1767ae75e098ae224337cc2b8bd886be54c2e86
......@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment