summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Qt Project <gerrit-noreply@qt-project.org>2022-04-08 07:52:17 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2022-04-08 07:52:17 +0000
commitdfc69dbea50560a5fa9388c99cbeceeb37c676b1 (patch)
treea5e0c4654f3b21207074b218303e9788b8c6cf12
parent6e4b5560b1eb3835d247eef828f90da78692150a (diff)
parent6ce70663712a36bfc95c9e8c0f4ebd14102ff327 (diff)
downloadqbs-dfc69dbea50560a5fa9388c99cbeceeb37c676b1.tar.gz
Merge "Merge remote-tracking branch 'origin/1.21' into 1.22" into 1.22
-rw-r--r--doc/appendix/json-api.qdoc2
-rw-r--r--share/qbs/module-providers/Qt/templates/quick.qbs5
-rw-r--r--src/lib/corelib/buildgraph/projectbuilddata.cpp1
3 files changed, 5 insertions, 3 deletions
diff --git a/doc/appendix/json-api.qdoc b/doc/appendix/json-api.qdoc
index 78e359017..68bb644cf 100644
--- a/doc/appendix/json-api.qdoc
+++ b/doc/appendix/json-api.qdoc
@@ -765,7 +765,7 @@
\c items is an array of objects with the following structure:
\table
\header \li Property \li Type \li Mandatory
- \row \li \c message \li string \li yes
+ \row \li description \li string \li yes
\row \li location \li \l Location \li no
\endtable
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
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index 0ac6b1537..e0e70e650 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -240,7 +240,6 @@ void ProjectBuildData::removeArtifact(Artifact *artifact,
artifact->transformer->outputs.remove(artifact);
if (removeFromProduct)
artifact->product->buildData->removeArtifact(artifact);
- m_isDirty = false;
}
void ProjectBuildData::setDirty()