Merge "Merge 1.22 into master"

7 files changed, 22 insertions, 10 deletions

diff --git a/changelogs/changes-1.22.1.md b/changelogs/changes-1.22.1.md
index 2dce55bad..34c58f2ff 100644
--- a/changelogs/changes-1.22.1.md
+++ b/changelogs/changes-1.22.1.md
@@ -1,7 +1,16 @@
 # General
 
-* Adapted to changes in Xcode 13.3 (QBS-1693)
+* Adapted to changes in Xcode 13.3 (QBS-1693).
+* Re-added several bugfixes from 1.21.1 that got lost in 1.22.0.
 
 # Qt Support
 
-* Fixed building against static Qt 6 (QBS-1692)
+* Fixed building against static Qt 6 (QBS-1692).
+
+# Android Support
+
+* Fixed wrong include path being added to the command line (QBS-1691).
+
+# Documentation
+
+* Fixed outdated use of "product" in Export items (QBS-1694).
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/doc/howtos.qdoc b/doc/howtos.qdoc
index efb9648c7..e21a2588d 100644
--- a/doc/howtos.qdoc
+++ b/doc/howtos.qdoc
@@ -100,7 +100,7 @@
             ]
             Export {
                 Depends { name: "cpp" }
-                cpp.includePaths: [product.sourceDirectory]
+                cpp.includePaths: [exportingProduct.sourceDirectory]
            }
         }
     }
diff --git a/doc/reference/modules/exporter-qbs-module.qdoc b/doc/reference/modules/exporter-qbs-module.qdoc
index 2a4da052f..cea5aad70 100644
--- a/doc/reference/modules/exporter-qbs-module.qdoc
+++ b/doc/reference/modules/exporter-qbs-module.qdoc
@@ -57,10 +57,11 @@
         }
         Export {
             Depends { name: "cpp" }
-            cpp.includePaths: [product.sourceDirectory]
+            cpp.includePaths: [exportingProduct.sourceDirectory]
             prefixMapping: [{
-                    prefix: product.sourceDirectory,
-                    replacement: FileInfo.joinPaths(qbs.installPrefix, product.headersInstallDir)
+                    prefix: exportingProduct.sourceDirectory,
+                    replacement: FileInfo.joinPaths(exportingProduct.qbs.installPrefix,
+                                                    exportingProduct.headersInstallDir)
                 }]
         }
     }
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/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs
index 8f0e4c905..aded485cd 100644
--- a/share/qbs/modules/cpp/android-gcc.qbs
+++ b/share/qbs/modules/cpp/android-gcc.qbs
@@ -128,7 +128,7 @@ LinuxGCC {
     // When using ndk r19c, llvm doesn't add sysroot/usr/include/c++/v1 to the path
     // But it works starting with ndk r20b
     systemIncludePaths: (Utilities.versionCompare(Android.ndk.version, "20") < 0) ?
-                            FileInfo.joinPaths(sysroot, "usr", "include", "c++", "v1") : ""
+                            FileInfo.joinPaths(sysroot, "usr", "include", "c++", "v1") : []
 
     defines: ["ANDROID", "__ANDROID__"]
 
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()