diff options
| author | ruki <[email protected]> | 2023-06-17 07:01:12 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-06-17 07:01:12 +0800 |
| commit | 994623292655a1a84444c5dbd773c2c82a343884 (patch) | |
| tree | 88fe8bd3ebabf8017951561614ef420e02be8559 | |
| parent | db145ed6604e839f58f510666cd5f639525fac35 (diff) | |
| parent | d6592f68631ff3d7002ebda08da02e9bba60e65b (diff) | |
Merge pull request #3852 from iphelf/dev
Add `qmake-qt5` as a candidate for `qmake`
| -rw-r--r-- | xmake/modules/detect/sdks/find_qt.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index 581904450..d591a289c 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -161,7 +161,7 @@ function _find_qmake(sdkdir, sdkver) -- we need find the default qmake in current system -- maybe we only installed qmake6 if not qmake then - local suffixes = {"", "6"} + local suffixes = {"", "6", "-qt5"} for _, suffix in ipairs(suffixes) do qmake = find_tool("qmake", {program = "qmake" .. suffix, paths = sdkdir and path.join(sdkdir, "bin")}) if qmake then |