diff options
| author | ruki <[email protected]> | 2022-06-26 08:00:19 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-26 08:00:19 +0800 |
| commit | 0193607c1904a7c4c11725eb0f4e9bc03fb174d0 (patch) | |
| tree | e08168ff45a1c74fd9b70bf1a44229bd6c9ef2ae | |
| parent | 51b26ec4eccaaf9d562e8b69aecd1e2f21d3168b (diff) | |
| parent | 7db70c0c2b5bc016f81f32d084fb694107b47699 (diff) | |
Merge pull request #2494 from Arthapz/dev
Fix qmlplugin outputdir and qmldir file handling
| -rw-r--r-- | xmake/rules/qt/qmltyperegistrar/xmake.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/rules/qt/qmltyperegistrar/xmake.lua b/xmake/rules/qt/qmltyperegistrar/xmake.lua index 38a04bbc4..d0e8b92bf 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 @@ -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 |