diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index c0f61301111..c53b479982d 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -1119,27 +1119,3 @@ function(qtc_add_public_header header) COMPONENT Devel EXCLUDE_FROM_ALL ) endfunction() - -function (add_qtc_lua_plugin name) - cmake_parse_arguments(_arg "EXCLUDE_FROM_INSTALL" "" "SOURCES" ${ARGN}) - - if (${_arg_UNPARSED_ARGUMENTS}) - message(FATAL_ERROR "add_qtc_lua_plugin had unparsed arguments!") - endif() - - qtc_copy_to_builddir(${name} - FILES ${_arg_SOURCES} - DESTINATION ${IDE_PLUGIN_PATH} - ) - - if (NOT _arg_EXCLUDE_FROM_INSTALL) - foreach(SOURCE ${_arg_SOURCES}) - get_filename_component(SOURCE_DIR "${SOURCE}" DIRECTORY) - - install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - DESTINATION ${IDE_PLUGIN_PATH}/${SOURCE_DIR} - ) - endforeach() - endif() -endfunction() diff --git a/qt_attributions.json b/qt_attributions.json index 56e4fe0595c..74bd2cae83f 100644 --- a/qt_attributions.json +++ b/qt_attributions.json @@ -618,11 +618,11 @@ "QDocModule": "qtcreator", "QtParts": ["tools"], "QtUsage": "Used for pretty printing from Lua scripts.", - "Path": "src/plugins/luatests/luatests", + "Path": "share/qtcreator/lua-plugins/luatests", "Description": "inspect.lua is a library for pretty printing complex objects in Lua.", "Homepage": "https://github.com/kikito/inspect.lua", "License": "MIT License", - "LicenseFile": "src/plugins/luatests/luatests/INSPECT-LICENSE.txt", + "LicenseFile": "share/qtcreator/lua-plugins/luatests/INSPECT-LICENSE.txt", "Copyright": "Copyright (c) 2022 Enrique GarcĂ­a Cota" } ] diff --git a/share/qtcreator/CMakeLists.txt b/share/qtcreator/CMakeLists.txt index 96791362ec7..6a18147f9fd 100644 --- a/share/qtcreator/CMakeLists.txt +++ b/share/qtcreator/CMakeLists.txt @@ -4,6 +4,7 @@ set(resource_directories glsl indexer_preincludes jsonschemas + lua-plugins modeleditor qmldesigner qmlicons diff --git a/src/plugins/luals/luals/init.lua b/share/qtcreator/lua-plugins/luals/init.lua similarity index 100% rename from src/plugins/luals/luals/init.lua rename to share/qtcreator/lua-plugins/luals/init.lua diff --git a/src/plugins/luals/luals/luals.lua b/share/qtcreator/lua-plugins/luals/luals.lua similarity index 100% rename from src/plugins/luals/luals/luals.lua rename to share/qtcreator/lua-plugins/luals/luals.lua diff --git a/src/plugins/luatests/luatests/INSPECT-LICENSE.txt b/share/qtcreator/lua-plugins/luatests/INSPECT-LICENSE.txt similarity index 100% rename from src/plugins/luatests/luatests/INSPECT-LICENSE.txt rename to share/qtcreator/lua-plugins/luatests/INSPECT-LICENSE.txt diff --git a/src/plugins/luatests/luatests/guidemo.lua b/share/qtcreator/lua-plugins/luatests/guidemo.lua similarity index 100% rename from src/plugins/luatests/luatests/guidemo.lua rename to share/qtcreator/lua-plugins/luatests/guidemo.lua diff --git a/src/plugins/luatests/luatests/inspect.lua b/share/qtcreator/lua-plugins/luatests/inspect.lua similarity index 100% rename from src/plugins/luatests/luatests/inspect.lua rename to share/qtcreator/lua-plugins/luatests/inspect.lua diff --git a/src/plugins/luatests/luatests/luatests.lua b/share/qtcreator/lua-plugins/luatests/luatests.lua similarity index 100% rename from src/plugins/luatests/luatests/luatests.lua rename to share/qtcreator/lua-plugins/luatests/luatests.lua diff --git a/src/plugins/luatests/luatests/qtctest.lua b/share/qtcreator/lua-plugins/luatests/qtctest.lua similarity index 100% rename from src/plugins/luatests/luatests/qtctest.lua rename to share/qtcreator/lua-plugins/luatests/qtctest.lua diff --git a/src/plugins/luatests/luatests/tests.lua b/share/qtcreator/lua-plugins/luatests/tests.lua similarity index 100% rename from src/plugins/luatests/luatests/tests.lua rename to share/qtcreator/lua-plugins/luatests/tests.lua diff --git a/src/plugins/luatests/luatests/tst_aspectcontainer.lua b/share/qtcreator/lua-plugins/luatests/tst_aspectcontainer.lua similarity index 100% rename from src/plugins/luatests/luatests/tst_aspectcontainer.lua rename to share/qtcreator/lua-plugins/luatests/tst_aspectcontainer.lua diff --git a/src/plugins/luatests/luatests/tst_fetch.lua b/share/qtcreator/lua-plugins/luatests/tst_fetch.lua similarity index 100% rename from src/plugins/luatests/luatests/tst_fetch.lua rename to share/qtcreator/lua-plugins/luatests/tst_fetch.lua diff --git a/src/plugins/luatests/luatests/tst_utils.lua b/share/qtcreator/lua-plugins/luatests/tst_utils.lua similarity index 100% rename from src/plugins/luatests/luatests/tst_utils.lua rename to share/qtcreator/lua-plugins/luatests/tst_utils.lua diff --git a/src/plugins/rustls/rustls/init.lua b/share/qtcreator/lua-plugins/rustls/init.lua similarity index 100% rename from src/plugins/rustls/rustls/init.lua rename to share/qtcreator/lua-plugins/rustls/init.lua diff --git a/src/plugins/rustls/rustls/rustls.lua b/share/qtcreator/lua-plugins/rustls/rustls.lua similarity index 100% rename from src/plugins/rustls/rustls/rustls.lua rename to share/qtcreator/lua-plugins/rustls/rustls.lua diff --git a/src/plugins/tellajoke/tellajoke/tellajoke.lua b/share/qtcreator/lua-plugins/tellajoke/tellajoke.lua similarity index 100% rename from src/plugins/tellajoke/tellajoke/tellajoke.lua rename to share/qtcreator/lua-plugins/tellajoke/tellajoke.lua diff --git a/src/app/main.cpp b/src/app/main.cpp index 86c9106a565..4ec11d5e896 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -177,8 +177,11 @@ static inline int askMsgSendFailed() static inline QStringList getPluginPaths() { - QStringList rc(QDir::cleanPath(QApplication::applicationDirPath() - + '/' + RELATIVE_PLUGIN_PATH)); + QStringList rc; + rc << (QDir::cleanPath(QApplication::applicationDirPath() + + '/' + RELATIVE_PLUGIN_PATH)) + << (QDir::cleanPath(QApplication::applicationDirPath() + + '/' + RELATIVE_DATA_PATH + "/lua-plugins")); // Local plugin path: /plugins/ // where is e.g. // "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index a0bfe5b1cfc..423b17d9284 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -119,7 +119,3 @@ endif() add_subdirectory(qnx) add_subdirectory(mcusupport) add_subdirectory(qtapplicationmanager) -add_subdirectory(luatests) -add_subdirectory(tellajoke) -add_subdirectory(luals) -add_subdirectory(rustls) diff --git a/src/plugins/luals/CMakeLists.txt b/src/plugins/luals/CMakeLists.txt deleted file mode 100644 index cec9a052dee..00000000000 --- a/src/plugins/luals/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_qtc_lua_plugin(luals - SOURCES luals/luals.lua - luals/init.lua -) diff --git a/src/plugins/luals/luals.qbs b/src/plugins/luals/luals.qbs deleted file mode 100644 index ea05595f80a..00000000000 --- a/src/plugins/luals/luals.qbs +++ /dev/null @@ -1,8 +0,0 @@ -QtcLuaPlugin { - name: "luals" - - luafiles: [ - "init.lua", - "luals.lua", - ] -} diff --git a/src/plugins/luatests/CMakeLists.txt b/src/plugins/luatests/CMakeLists.txt deleted file mode 100644 index 0bad7da433b..00000000000 --- a/src/plugins/luatests/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_qtc_lua_plugin(luatests - SOURCES - luatests/luatests.lua - luatests/tests.lua - luatests/inspect.lua - luatests/qtctest.lua - luatests/tst_aspectcontainer.lua - luatests/tst_fetch.lua - luatests/tst_utils.lua - luatests/guidemo.lua -) diff --git a/src/plugins/luatests/luatests.qbs b/src/plugins/luatests/luatests.qbs deleted file mode 100644 index 687cd6579bd..00000000000 --- a/src/plugins/luatests/luatests.qbs +++ /dev/null @@ -1,14 +0,0 @@ -QtcLuaPlugin { - name: "luatests" - - luafiles: [ - "inspect.lua", - "guidemo.lua", - "luatests.lua", - "qtctest.lua", - "tests.lua", - "tst_aspectcontainer.lua", - "tst_fetch.lua", - "tst_utils.lua", - ] -} diff --git a/src/plugins/rustls/CMakeLists.txt b/src/plugins/rustls/CMakeLists.txt deleted file mode 100644 index 17184ddf139..00000000000 --- a/src/plugins/rustls/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_qtc_lua_plugin(rustls - SOURCES rustls/rustls.lua - rustls/init.lua -) diff --git a/src/plugins/rustls/rustls.qbs b/src/plugins/rustls/rustls.qbs deleted file mode 100644 index f629705f098..00000000000 --- a/src/plugins/rustls/rustls.qbs +++ /dev/null @@ -1,8 +0,0 @@ -QtcLuaPlugin { - name: "rustls" - - luafiles: [ - "init.lua", - "rustls.lua", - ] -} diff --git a/src/plugins/tellajoke/CMakeLists.txt b/src/plugins/tellajoke/CMakeLists.txt deleted file mode 100644 index c9dfcf23d20..00000000000 --- a/src/plugins/tellajoke/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qtc_lua_plugin(tellajoke SOURCES tellajoke/tellajoke.lua) diff --git a/src/plugins/tellajoke/tellajoke.qbs b/src/plugins/tellajoke/tellajoke.qbs deleted file mode 100644 index d2efc1a64e8..00000000000 --- a/src/plugins/tellajoke/tellajoke.qbs +++ /dev/null @@ -1,5 +0,0 @@ -QtcLuaPlugin { - name: "tellajoke" - - luafiles: "tellajoke.lua" -}