diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2024-05-10 13:42:15 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2024-05-10 13:42:15 +0200 |
| commit | c5f7f5d27ae9ec0ba1ac4832060ee8dfeca21e6f (patch) | |
| tree | cc5041a6139a30a25b2316d9a5686671f04183f7 | |
| parent | 67af0c9517b01c482f425a6761b1cf38c486d3c3 (diff) | |
| parent | fc4dec2f6a82c11ff7fe1aac2408d83dbbd1a9c5 (diff) | |
Merge 2.3 into master
Change-Id: Ibfa0e6880a3da48c5fefa4a4ed3b0f450698d567
| -rw-r--r-- | changelogs/changes-2.3.0.md | 2 | ||||
| -rw-r--r-- | changelogs/changes-2.3.1.md | 2 | ||||
| -rw-r--r-- | doc/qbs.qdoc | 2 | ||||
| -rw-r--r-- | doc/tutorial.qdoc | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/changelogs/changes-2.3.0.md b/changelogs/changes-2.3.0.md index 9062b27ff..364248ee1 100644 --- a/changelogs/changes-2.3.0.md +++ b/changelogs/changes-2.3.0.md @@ -17,7 +17,7 @@ * Module properties are now accessible for groups in modules (QBS-1770). * Fixed pathList properties in Probes (QBS-1785). * The qbspkgconfig.mergeDependencies property was removed. -* ModuleProviders now support the 'allowedValues' property of the PropertyDeclaration item +* ModuleProviders now support the 'allowedValues' property of the PropertyOptions item (QBS-1748). # Apple diff --git a/changelogs/changes-2.3.1.md b/changelogs/changes-2.3.1.md index 6c4b6c0ad..df079ada6 100644 --- a/changelogs/changes-2.3.1.md +++ b/changelogs/changes-2.3.1.md @@ -2,7 +2,7 @@ * Fixed look-up of qbs properties in module providers via probes (QBS-1742). # Apple support -* Fixed codesing module when multiplexing over build variants (QBS-1775). +* Fixed codesign module when multiplexing over build variants (QBS-1775). # Qt support * Fixed retrieving minimum macOS/iOS versions for Qt 6.7.1. diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index cbe33f98a..83e461f29 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -72,7 +72,7 @@ \endlist \li \l{Tutorial} \list - \li \l{tutorial-1.html}{Application} + \li \l{tutorial-1.html}{Console Application} \li \l{tutorial-2.html}{Static Library} \li \l{tutorial-3.html}{Dynamic Library} \li \l{tutorial-4.html}{Convenience Items} diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc index 7d336b5b3..b17cf4faf 100644 --- a/doc/tutorial.qdoc +++ b/doc/tutorial.qdoc @@ -36,7 +36,7 @@ concepts. \list - \li \l{tutorial-1.html}{Application} + \li \l{tutorial-1.html}{Console Application} \li \l{tutorial-2.html}{Static Library} \li \l{tutorial-3.html}{Dynamic Library} \li \l{tutorial-4.html}{Convenience Items} @@ -53,7 +53,7 @@ \page tutorial-1.html \nextpage tutorial-2.html - \title Application + \title Console Application Let's start with a mandatory Hello World example. There is a Hello World example in the \l{overview.html#well-defined-language}{overview section}, but this time we will create a |