diff options
Diffstat (limited to 'share/qbs/module-providers/Qt/templates/gui.qbs')
-rw-r--r-- | share/qbs/module-providers/Qt/templates/gui.qbs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/share/qbs/module-providers/Qt/templates/gui.qbs b/share/qbs/module-providers/Qt/templates/gui.qbs index a3c427175..1d45c6f1e 100644 --- a/share/qbs/module-providers/Qt/templates/gui.qbs +++ b/share/qbs/module-providers/Qt/templates/gui.qbs @@ -23,9 +23,11 @@ QtModule { } prepare: { - var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/' - + ModUtils.moduleProperty(product, "uicName"), - [input.filePath, '-o', output.filePath]) + var uicPath = Utilities.versionCompare(product.Qt.gui.version, "6.1") < 0 + ? product.Qt.core.binPath + '/' + product.Qt.gui.uicName + : product.Qt.core.libExecPath + '/' + product.Qt.gui.uicName; + + var cmd = new Command(uicPath, [input.filePath, '-o', output.filePath]); cmd.description = 'uic ' + input.fileName; cmd.highlight = 'codegen'; return cmd; |