diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2022-07-30 15:26:39 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-08-03 09:43:26 +0000 |
| commit | 2c8c7eb4d784857e0c90e9231ed4bdaadab24b32 (patch) | |
| tree | 20403aaefd26508aef8e4658a6437e7c2a18a05b | |
| parent | b28bed52a260ae5e1b04f4e2fc7219c1a900f048 (diff) | |
Qt support: Adapt to change in location of the qhelpgenerator tool
Change-Id: Idf4652963cca9e32bc086ea67fd7d4af6461ba17
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/Qt/setup-qt.js | 7 | ||||
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/core.qbs | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/changelogs/changes-1.23.1.md b/changelogs/changes-1.23.1.md index 6c2d4b94d..8423b229b 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. +* Adapted to new location of qhelpgenerator in Qt 6.3. * Fixed setting up Qt 6.3 with qbspkgconfig. # Other modules diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index 040f9d951..a8fbf9dae 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -281,7 +281,11 @@ function getQtProperties(qmakeFilePath, qbs) { // QML tools were only moved in Qt 6.2. qtProps.qmlLibExecPath = Utilities.versionCompare(qtProps.qtVersion, "6.2") >= 0 - ? qtProps.libExecPath : qtProps.binaryPath + ? qtProps.libExecPath : qtProps.binaryPath; + + // qhelpgenerator was only moved in Qt 6.3. + qtProps.helpGeneratorLibExecPath = Utilities.versionCompare(qtProps.qtVersion, "6.3") >= 0 + ? qtProps.libExecPath : qtProps.binaryPath; if (!File.exists(qtProps.mkspecBasePath)) throw "Cannot extract the mkspecs directory."; @@ -1433,6 +1437,7 @@ function replaceSpecialValues(content, module, qtProps, abi) { pluginPath: ModUtils.toJSLiteral(qtProps.pluginPath), incPath: ModUtils.toJSLiteral(qtProps.includePath), docPath: ModUtils.toJSLiteral(qtProps.documentationPath), + helpGeneratorLibExecPath: ModUtils.toJSLiteral(qtProps.helpGeneratorLibExecPath), mkspecName: ModUtils.toJSLiteral(qtProps.mkspecName), mkspecPath: ModUtils.toJSLiteral(qtProps.mkspecPath), version: ModUtils.toJSLiteral(qtProps.qtVersion), diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs index c3c68164f..f00f16211 100644 --- a/share/qbs/module-providers/Qt/templates/core.qbs +++ b/share/qbs/module-providers/Qt/templates/core.qbs @@ -57,6 +57,7 @@ Module { property string qdocName: versionMajor >= 5 ? "qdoc" : "qdoc3" property stringList qdocEnvironment property path docPath: @docPath@ + property string helpGeneratorLibExecPath: @helpGeneratorLibExecPath@ property stringList helpGeneratorArgs: versionMajor >= 5 ? ["-platform", "minimal"] : [] property var versionParts: version ? version.split('.').map(function(item) { return parseInt(item, 10); }) : [] property int versionMajor: versionParts[0] @@ -545,7 +546,8 @@ Module { args = args.concat(product.Qt.core.helpGeneratorArgs); args.push("-o"); args.push(output.filePath); - var cmd = new Command(product.Qt.core.binPath + "/qhelpgenerator", args); + var cmd = new Command( + product.Qt.core.helpGeneratorLibExecPath + "/qhelpgenerator", args); cmd.description = 'qhelpgenerator ' + input.fileName; cmd.highlight = 'filegen'; cmd.stdoutFilterFunction = function(output) { |