diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-08 12:08:44 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-08 12:08:44 +0200 |
commit | fa5b6e31912f7c7515b8d937b37df0ffaf980943 (patch) | |
tree | 9e8214842a3858f008bc723ba7379271e49ee99b | |
parent | f0800b40df8ee152d522a1cd40b7ad1a8cf03f4b (diff) | |
parent | 0ccbc9f30d3fc6994d6ec3a7db0ed60e2c9dc500 (diff) | |
download | qbs-fa5b6e31912f7c7515b8d937b37df0ffaf980943.tar.gz |
Merge 1.22 into master
Change-Id: I9d36b1bacae3c0f449c67d985fea626e798e4f8b
-rw-r--r-- | changelogs/changes-1.22.1.md | 13 | ||||
-rw-r--r-- | doc/appendix/json-api.qdoc | 2 | ||||
-rw-r--r-- | doc/howtos.qdoc | 2 | ||||
-rw-r--r-- | doc/reference/modules/exporter-qbs-module.qdoc | 7 | ||||
-rw-r--r-- | share/qbs/module-providers/Qt/templates/quick.qbs | 5 | ||||
-rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 2 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/projectbuilddata.cpp | 1 |
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() |