diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2022-07-29 16:26:40 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-07-29 15:59:41 +0000 |
commit | 1e85fd662c6a01d65cee30dbca697152b58e59de (patch) | |
tree | d352d7ecca04efb0968dd89ce4d654932164d46e /share/qbs/module-providers/Qt/templates/scxml.qbs | |
parent | 46b76fbad9bb658204db04f28ff8a4ce9f53f0ef (diff) | |
download | qbs-1e85fd662c6a01d65cee30dbca697152b58e59de.tar.gz |
Qt support: Adapt to change in location of the qscxmlc tool
It's in the libexec dir as of Qt 6.3.
Change-Id: Id6e86b41ee956732d81aa18d3b44ccb436c38c0b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/module-providers/Qt/templates/scxml.qbs')
-rw-r--r-- | share/qbs/module-providers/Qt/templates/scxml.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/module-providers/Qt/templates/scxml.qbs b/share/qbs/module-providers/Qt/templates/scxml.qbs index fdd11e952..b800dfe70 100644 --- a/share/qbs/module-providers/Qt/templates/scxml.qbs +++ b/share/qbs/module-providers/Qt/templates/scxml.qbs @@ -5,6 +5,8 @@ import "../QtModule.qbs" as QtModule QtModule { qtModuleName: "Scxml" + property string _qscxmlcDir: Utilities.versionCompare(Qt.core.version, "6.3") >= 0 + ? Qt.core.libExecPath : Qt.core.binPath property string qscxmlcName: "qscxmlc" property string className property string namespace @@ -26,8 +28,7 @@ QtModule { prepare: { var compilerName = product.moduleProperty("Qt.scxml", "qscxmlcName"); - var compilerPath = FileInfo.joinPaths(input.moduleProperty("Qt.core", "binPath"), - compilerName); + var compilerPath = FileInfo.joinPaths(input.Qt.scxml._qscxmlcDir, compilerName); var args = ["--header", outputs["hpp"][0].filePath, "--impl", outputs["cpp"][0].filePath]; var cxx98 = input.moduleProperty("cpp", "cxxLanguageVersion") === "c++98"; |