diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-07-30 09:33:58 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-08-03 08:40:47 +0000 |
commit | b28bed52a260ae5e1b04f4e2fc7219c1a900f048 (patch) | |
tree | 980fd6fc22ab6221f2032b5eab72e7ec56ce0767 | |
parent | cd9ee0526a6ed2dfb57dc5ecc1cf2613e0c499b7 (diff) | |
download | qbs-b28bed52a260ae5e1b04f4e2fc7219c1a900f048.tar.gz |
Fix setting up Qt 6.3 with qbspkgconfig
The 'host_bins' variable was renamed to 'bindir'.
Change-Id: Iab235ea7c5ba93d7c815470e432b293f7a06ab37
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | changelogs/changes-1.23.1.md | 1 | ||||
-rw-r--r-- | share/qbs/module-providers/qbspkgconfig.qbs | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/changelogs/changes-1.23.1.md b/changelogs/changes-1.23.1.md index 9a0a20d66..6c2d4b94d 100644 --- a/changelogs/changes-1.23.1.md +++ b/changelogs/changes-1.23.1.md @@ -4,6 +4,7 @@ # Qt Support * Adapted to new location of qscxmlc in Qt 6.3. +* Fixed setting up Qt 6.3 with qbspkgconfig. # Other modules * Fixed protobuf linking on macOS 11. diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs index 7c31060f2..fc162320c 100644 --- a/share/qbs/module-providers/qbspkgconfig.qbs +++ b/share/qbs/module-providers/qbspkgconfig.qbs @@ -177,22 +177,22 @@ ModuleProvider { if (packageName === "QtCore" || packageName === "Qt5Core" || packageName === "Qt6Core") { - var hostBins = pkg.variables["host_bins"]; - if (!hostBins) { + var binDir = pkg.variables["bindir"] || pkg.variables["host_bins"]; + if (!binDir) { if (packageName === "QtCore") { // Qt4 does not have host_bins var mocLocation = pkg.variables["moc_location"]; if (!mocLocation) { console.warn("No moc_location variable in " + packageName); return; } - hostBins = FileInfo.path(mocLocation); + binDir = FileInfo.path(mocLocation); } else { - console.warn("No host_bins variable in " + packageName); + console.warn("No 'bindir' or 'host_bins' variable in " + packageName); return; } } var suffix = exeSuffix(qbs); - var qmakePaths = [FileInfo.joinPaths(hostBins, "qmake" + suffix)]; + var qmakePaths = [FileInfo.joinPaths(binDir, "qmake" + suffix)]; var qtProviderDir = FileInfo.joinPaths(path, "Qt"); SetupQt.doSetup(qmakePaths, outputBaseDir, qtProviderDir, qbs); } |