diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-01-18 14:41:16 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-01-19 10:41:58 +0000 |
| commit | 768b6894a8d189158fed83cbc79d92d5484cb2e4 (patch) | |
| tree | 9b2dab2b109b0e6d7cae45be59471a775096bd16 | |
| parent | 187446b5663a8b238eb2b6e04513368000ba2e53 (diff) | |
Qt support: Fix QtQuick compiler path for Qt 6
Amends 1e518097fa.
Change-Id: Id9c22085ec0f2e3f771e8df453fc9dbb79720d5c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/quick.qbs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/templates/quick.qbs b/share/qbs/module-providers/Qt/templates/quick.qbs index 00174150e..ff795cb8d 100644 --- a/share/qbs/module-providers/Qt/templates/quick.qbs +++ b/share/qbs/module-providers/Qt/templates/quick.qbs @@ -71,9 +71,12 @@ QtModule { readonly property string _generatedLoaderFileName: _compilerIsQmlCacheGen ? "qmlcache_loader.cpp" : "qtquickcompiler_loader.cpp" + property string _compilerBaseDir: _compilerIsQmlCacheGen ? Qt.core.qmlLibExecPath + : Qt.core.binPath property string compilerBaseName: (_compilerIsQmlCacheGen ? "qmlcachegen" : "qtquickcompiler") - property string compilerFilePath: FileInfo.joinPaths(Qt.core.binPath, + property string compilerFilePath: FileInfo.joinPaths(_compilerBaseDir, compilerBaseName + product.cpp.executableSuffix) + property bool compilerAvailable: File.exists(compilerFilePath); property bool useCompiler: compilerAvailable && !_compilerIsQmlCacheGen |