diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-06-19 16:06:29 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-06-28 11:22:59 +0000 |
| commit | b12ba08de0bd422659fe882ac4d5faf14d3fd207 (patch) | |
| tree | 5336580c59f09828d60bc4b7b53d0e9dfed3f2bd /qbs | |
| parent | b5564b582089e2e75c5416785e48783bdc4a7a5e (diff) | |
Build systems: Do not put qbs plugins under the qtcreator plugins dir
Otherwise, the extension system will unnecessarily try to load them at
start-up.
Change-Id: I7a932904835cb387e3cf10924ca79a58e5f92b33
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 7 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index eca4f33508..1ee8cef7a1 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -34,7 +34,10 @@ 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 + "/qbs/plugins" + property string pluginsInstallBaseDir: qbs.targetOS.contains("darwin") + ? qtc.ide_plugin_path + "/.." + : qtc.ide_library_path + "/.." + property string pluginsInstallDir: pluginsInstallBaseDir + "/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 @@ -44,7 +47,7 @@ Module { property string relativeLibexecPath: FileInfo.relativePath('/' + appInstallDir, '/' + libexecInstallDir) property string relativePluginsPath: FileInfo.relativePath('/' + appInstallDir, - '/' + qtc.ide_plugin_path) + '/' + pluginsInstallBaseDir) property string relativeSearchPath: FileInfo.relativePath('/' + appInstallDir, '/' + resourcesInstallDir) } diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 8a78e329b0..75f85ab79d 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -41,7 +41,7 @@ Module { } property string ide_plugin_path: { if (qbs.targetOS.contains("macos")) - return ide_app_target + ".app/Contents/PlugIns" + return ide_app_target + ".app/Contents/PlugIns/qtcreator" else if (qbs.targetOS.contains("windows")) return libDirName + "/qtcreator/plugins" else |