diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-07 11:58:23 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-07 11:58:23 +0100 |
| commit | 5432dd1f5c43d9859e08e6e3a33baf600b33950d (patch) | |
| tree | cdfa0d672607bfa86fae687e774338bc5066bf94 /qbs | |
| parent | d3bb3c09535963eb8b711edb08ee79b7dcc9a393 (diff) | |
| parent | 631d9cd711ed348699bb265b7c9333600c8636e3 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/coreplugin/locator/locator.cpp
src/plugins/imageviewer/imageviewerplugin.cpp
src/plugins/remotelinux/remotelinuxplugin.cpp
src/tools/clangbackend/source/tokeninfo.cpp
tests/unit/unittest/data/highlightingmarks.cpp
Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index ed754e43da..845ce4139c 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -16,6 +16,7 @@ Module { : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path] property string resourcesInstallDir: qtc.ide_data_path + "/qbs" property string pluginsInstallDir: qtc.ide_plugin_path + "/qbs/plugins" + property string qmlTypeDescriptionsInstallDir: qtc.ide_data_path + "/qml-type-descriptions" property string appInstallDir: qtc.ide_bin_path property string libexecInstallDir: qtc.ide_libexec_path property bool installHtml: false |