feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Build systems: Do not put qbs plugins under the qtcreator plugins dir

Browse Source 
Otherwise, the extension system will unnecessarily try to load them at
start-up.

Change-Id: I7a932904835cb387e3cf10924ca79a58e5f92b33
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2023-06-19 16:06:29 +02:00
parent b5564b5820
commit b12ba08de0
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtCreatorAPIInternal.cmake
View File

@@ -49,7 +49,7 @@ if (APPLE)
set(_IDE_LIBRARY_BASE_PATH "Frameworks")
set(_IDE_LIBRARY_PATH "${_IDE_OUTPUT_PATH}/${_IDE_LIBRARY_BASE_PATH}")
set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns")
set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns/qtcreator")
set(_IDE_LIBEXEC_PATH "${_IDE_OUTPUT_PATH}/Resources/libexec")
set(_IDE_DATA_PATH "${_IDE_OUTPUT_PATH}/Resources")
set(_IDE_DOC_PATH "${_IDE_OUTPUT_PATH}/Resources/doc")

7
qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
View File

@@ -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)
}

2
qbs/modules/qtc/qtc.qbs
View File

@@ -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

6
src/shared/CMakeLists.txt
View File

@@ -19,7 +19,11 @@ if (BUILD_QBS)
set(QBS_LIB_INSTALL_DIR "${IDE_LIBRARY_PATH}" CACHE STRING "" FORCE)
set(QBS_DLL_INSTALL_DIR "${IDE_BIN_PATH}" CACHE STRING "" FORCE)
set(QBS_LIBEXEC_INSTALL_DIR "${IDE_LIBEXEC_PATH}" CACHE STRING "" FORCE)
set(QBS_PLUGINS_INSTALL_BASE "${IDE_PLUGIN_PATH}" CACHE STRING "" FORCE)
if (APPLE)
set(QBS_PLUGINS_INSTALL_BASE "${IDE_PLUGIN_PATH}/../" CACHE STRING "" FORCE)
else()
set(QBS_PLUGINS_INSTALL_BASE "${_IDE_LIBRARY_BASE_PATH}/" CACHE STRING "" FORCE)
endif()
set(QBS_RESOURCES_INSTALL_BASE "${IDE_DATA_PATH}/qbs" CACHE STRING "" FORCE)
set(QBS_DOC_INSTALL_DIR "${IDE_DOC_PATH}" CACHE STRING "" FORCE)
set(QBS_HEADERS_INSTALL_DIR "${IDE_DATA_PATH}/qbs/include/qbs" CACHE STRING "" FORCE)