diff options
| author | ruki <[email protected]> | 2026-01-12 11:19:23 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-01-12 11:19:23 +0800 |
| commit | 0bb0eca7e93dbdc1390fee4a7bcf30c7cf834a66 (patch) | |
| tree | 7a7d0528d90066796cd3b39c0890d3e7c7a51187 /xmake/modules | |
| parent | d1f4de4fe9450980b7098f3aa2598ba7e964aaf5 (diff) | |
| parent | 303d4349268ea98f4ec331570fa43987f8001800 (diff) | |
Merge pull request #7208 from RC1844/patch-4
support dynamic mkspec selection for Qt SDK
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/detect/sdks/find_qt.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index 8935be2c6..e0aa3b03d 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -286,7 +286,8 @@ function _find_qt(sdkdir, sdkver, sdkdir_host) local libdir = qtenvs.QT_INSTALL_LIBS local pluginsdir = qtenvs.QT_INSTALL_PLUGINS local includedir = qtenvs.QT_INSTALL_HEADERS - local mkspecsdir = qtenvs.QMAKE_MKSPECS or path.join(qtenvs.QT_INSTALL_ARCHDATA, "mkspecs") + local mkspecsdir = qtenvs.QMAKE_MKSPECS or path.join(qtenvs.QT_HOST_DATA, "mkspecs") + local mkspec = qtenvs.QMAKE_XSPEC or qtenvs.QMAKE_SPEC -- for 6.2 local bindir_host = qtenvs.QT_HOST_BINS if not bindir_host and libexecdir and is_plat("android", "iphoneos") then @@ -316,7 +317,7 @@ function _find_qt(sdkdir, sdkver, sdkdir_host) end end - return {sdkdir = sdkdir, bindir = bindir, bindir_host = bindir_host, libexecdir = libexecdir, libexecdir_host = libexecdir_host, libdir = libdir, includedir = includedir, qmldir = qmldir, pluginsdir = pluginsdir, mkspecsdir = mkspecsdir, sdkver = sdkver} + return {sdkdir = sdkdir, bindir = bindir, bindir_host = bindir_host, libexecdir = libexecdir, libexecdir_host = libexecdir_host, libdir = libdir, includedir = includedir, qmldir = qmldir, pluginsdir = pluginsdir, mkspecsdir = mkspecsdir, mkspec = mkspec, sdkver = sdkver} end -- find qt sdk toolchains |