From 768b6894a8d189158fed83cbc79d92d5484cb2e4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 18 Jan 2022 14:41:16 +0100 Subject: Qt support: Fix QtQuick compiler path for Qt 6 Amends 1e518097fa. Change-Id: Id9c22085ec0f2e3f771e8df453fc9dbb79720d5c Reviewed-by: Ivan Komissarov --- share/qbs/module-providers/Qt/templates/quick.qbs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3