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

Merge remote-tracking branch 'origin/15.0' into 16.0

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp

Change-Id: Ief5231ea380d67c7904034d8e9e5c2ea8b4bfbf4
This commit is contained in:
Eike Ziller
2025-01-23 10:11:35 +01:00
parent 2bac487904 39ba32fb60
commit d5e721ad39
8 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/lua/luaplugin.cpp
View File

@@ -321,7 +321,17 @@ public:
setupLuaExpander(globalMacroExpander());
pluginSpecsFromArchiveFactories().push_back([](const FilePath &path) {
pluginSpecsFromArchiveFactories().push_back([](const FilePath &path) -> QList<PluginSpec *> {
if (path.isFile()) {
if (path.suffix() == "lua") {
Utils::expected_str<PluginSpec *> spec = loadPlugin(path);
QTC_CHECK_EXPECTED(spec);
if (spec)
return {*spec};
}
return {};
}
QList<PluginSpec *> plugins;
auto dirs = path.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
for (const auto &dir : dirs) {