From f802a4bf25c935b5cc1da520458cdf957b84b928 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sat, 25 Jun 2022 19:09:41 +0200 Subject: Fix qmlplugin output directory --- xmake/rules/qt/qmltyperegistrar/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/rules/qt/qmltyperegistrar/xmake.lua b/xmake/rules/qt/qmltyperegistrar/xmake.lua index 38a04bbc4..a6e2419de 100644 --- a/xmake/rules/qt/qmltyperegistrar/xmake.lua +++ b/xmake/rules/qt/qmltyperegistrar/xmake.lua @@ -40,7 +40,7 @@ rule("qt.qmltyperegistrar") local importname = target:values("qt.qmlplugin.import_name") assert(importname, "QML plugin import name not set") - local targetdir = path.join(target:targetdir(), "imports") + local targetdir = target:targetdir() for _, dir in pairs(importname:split(".", { plain = true })) do targetdir = path.join(targetdir, dir) end -- cgit v1.3.1 From 7db70c0c2b5bc016f81f32d084fb694107b47699 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sat, 25 Jun 2022 19:10:10 +0200 Subject: Fix qmldir file handling --- xmake/rules/qt/qmltyperegistrar/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/rules/qt/qmltyperegistrar/xmake.lua b/xmake/rules/qt/qmltyperegistrar/xmake.lua index a6e2419de..d0e8b92bf 100644 --- a/xmake/rules/qt/qmltyperegistrar/xmake.lua +++ b/xmake/rules/qt/qmltyperegistrar/xmake.lua @@ -118,7 +118,7 @@ rule("qt.qmltyperegistrar") end) after_build(function(target) - local qmldir = target:values("qml.plugin.qmldirfile") + local qmldir = path.join(target:scriptdir(), target:values("qt.qmlplugin.qmldirfile")) if qmldir then os.cp(qmldir, target:targetdir()) end -- cgit v1.3.1