diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-07 10:43:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-07 10:45:31 +0200 |
| commit | 6ce70663712a36bfc95c9e8c0f4ebd14102ff327 (patch) | |
| tree | 0a43fec5dea61490b1ddfa043fb5393a7e8c43e2 /share | |
| parent | 2d85e7fd52a2897d43fd351eb202d5bd8213490e (diff) | |
| parent | 36639ff3a50fdaa7e49b5bdb95bc5f4c9ea65706 (diff) | |
| download | qbs-6ce70663712a36bfc95c9e8c0f4ebd14102ff327.tar.gz | |
Merge remote-tracking branch 'origin/1.21' into 1.22
It seems we completely forgot to merge 1.21 into master, losing at least
some of the bugfixes in 1.21.1.
Change-Id: I4e8e32a861da817d9b686991933d6a32332534c5
Diffstat (limited to 'share')
| -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 56436e0ee..276246d6d 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 |