diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-22 16:45:49 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-23 08:55:40 +0000 |
| commit | ff0d67dcd210f7d652799e0d16e1532a52116fcf (patch) | |
| tree | e5751236a5dbf0911ea0cbf7675ed7d6d944d235 /qbs | |
| parent | 7743532c7c5596beec8bc5354cc4c6078d81645e (diff) | |
Update qbs submodule
To HEAD of 1.11 branch. Also do the adaptations necessary because of the
branch switch.
Change-Id: Ief69ef014c10397c14fcd68a9ca770d1391d5491
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 492a6fe457..6c77099906 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -14,7 +14,7 @@ Module { ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)] : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path] property string resourcesInstallDir: qtc.ide_data_path + "/qbs" - property string pluginsInstallDir: qtc.ide_plugin_path + property string pluginsInstallDir: qtc.ide_plugin_path + "/qbs/plugins" property string appInstallDir: qtc.ide_bin_path property string libexecInstallDir: qtc.ide_libexec_path property bool installHtml: false |