diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-27 23:13:27 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-30 14:32:55 +0000 |
| commit | b69b569ff43299dec625d573b08fec642039afea (patch) | |
| tree | 87c16e337c86152b2b846bdd60bb9b928892102b /share/qbs/module-providers/Qt/templates/moc.js | |
| parent | 5160a0b6e386b157fc1f5375efd881b8433b29ee (diff) | |
Fix accessing binaries from libexec
Starting from Qt 6.1, some binaries were moved to libexec/ directory
from bin/ (e.g. moc, rcc, uic).
Fixes: QBS-1636
Change-Id: Iaa329773a3ffcea5f09c0663dd4159d839980525
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/module-providers/Qt/templates/moc.js')
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/moc.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/templates/moc.js b/share/qbs/module-providers/Qt/templates/moc.js index 92983e4f7..7d230267c 100644 --- a/share/qbs/module-providers/Qt/templates/moc.js +++ b/share/qbs/module-providers/Qt/templates/moc.js @@ -29,6 +29,7 @@ ****************************************************************************/ var ModUtils = require("qbs.ModUtils"); +var Utilities = require("qbs.Utilities"); function args(product, input, outputs) { @@ -78,7 +79,9 @@ function args(product, input, outputs) function fullPath(product) { - return product.Qt.core.binPath + '/' + product.Qt.core.mocName; + if (Utilities.versionCompare(product.Qt.core.version, "6.1") < 0) + return product.Qt.core.binPath + '/' + product.Qt.core.mocName; + return product.Qt.core.libExecPath + '/' + product.Qt.core.mocName; } function outputArtifacts(project, product, inputs, input) |