summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qttools6.2.0Qt Submodule Update Bot2021-10-041-3/+3
| | | | | Change-Id: I604c1a17137b0f09da7609079837bdbaf956b51b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-10-041-1/+1
| | | | | Change-Id: I176aaaa09cbe9ddc4534b50a1a03a44d4ac40793 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-021-1/+1
| | | | | | | | Current value should be empty to reflect the branch status. Pick-to: 6.2 Change-Id: Ie168517cff7cde4718dbd61aa85b89357021e187 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Document Qt Assistant licensesKai Köhne2021-09-273-2/+21
| | | | | | | | | | | | Make sure that the 3rd party qlitehtml licenses are visible in the Qt Assistant documentation. This also requires a small extension for qtattributionsscanner, so that 'tools' documentation can be picked up, too. Change-Id: Ib90004c1f3c74b42cbf00156674fab92d59057a8 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit d2fc6facca4ddf889bb4f5d1f60592fd228d246e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update qlitehtml submodulev6.2.0Jarek Kobus2021-09-251-0/+0
| | | | | | | | | | It fixes broken content links in Assistant Fixes: QTBUG-96694 Change-Id: Ia4914c27fb7bf570ecbfc2c5f0eac911aa89afcc Reviewed-by: Eike Ziller <eike.ziller@qt.io> (cherry picked from commit 93f264a7e8013becfa5ee59212728e7560cf1ed0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-09-251-3/+3
| | | | | Change-Id: I05bc506659b670edb50bf0bfd184d12a13c88e53 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-09-221-3/+3
| | | | | Change-Id: I083e4be97af052d6fe71d5d1f869828a71792f58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsv6.2.0-rc2Qt Submodule Update Bot2021-09-211-3/+3
| | | | | Change-Id: Id03a8aa26135470d00fff557682c664e77f2def6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-09-191-3/+3
| | | | | Change-Id: I834938b82bdc8af3fc7fb5eb93222e98249716f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsv6.2.0-rc1Qt Submodule Update Bot2021-09-141-3/+3
| | | | | Change-Id: Id0acf53fd517882d408727eeb87d80eabf29ffb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: I9601191fa554d69c73ae9b29f57475648e4b55da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: I1d020137bc3b5bebb75cb2e3dfbd613bd9234a3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: I629ed51dcfc68d9c00ac9e9c7d496ec77922eb6c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qttoolsQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: I9d9d1d399e0de99080a9f4c25dbeefe516001c95 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-081-3/+3
| | | | | Change-Id: Icc467bb4f8240268ce26e4085dfead7698c9367d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-071-1/+1
| | | | | Change-Id: I2c19e595fce313f10a0c1dbd055df4a82ae59dbb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* windeployqt: Include networkaccess and networkinformation pluginsMårten Nordheim2021-09-071-0/+2
| | | | | | | Change-Id: Ic06694fd1375659c37afc004e3cae5f50ddc600e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 8598a8b7f8775855d83847ba0b6a7897666a5533) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-071-3/+3
| | | | | Change-Id: I0b331adefbc0c4d0ca9784125c421a659ca32fe6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-061-3/+3
| | | | | Change-Id: Id52eb7ac1d6fb92c53bff19e90790e00243fca77 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* windeployqt: Fix deployment of tls pluginsJarkko Koivikko2021-09-061-1/+1
| | | | | | | | | | | Since Qt 6.x the bearer plugins are gone. Reuse that entry for tls plugins. Fixes: QTBUG-95247 Change-Id: I68f8b20942375b124ba9859c23f1b1c770ab406c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit cd8a01945c47956913739fadd047b5948cf89fed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix extensions without leading period having first character droppedCraig Scott2021-09-061-1/+1
| | | | | | | | | | | | | The list(TRANSFORM ... REPLACE) regular expression was malformed. CMake string parsing requires backslashes to be escaped if they need to be preserved instead of treating them as escaping the character that follows them. Fixes: QTBUG-96220 Change-Id: I61d46cfb7ed32fd97c49e15a1f58a055f12e596f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 581fc31c54aaa06af16c2047808a29be1a8d3239) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use functions rather than macros to implement versionless wrappersCraig Scott2021-09-061-4/+15
| | | | | | | | | | | | | | Macros add another level of argument escaping compared to functions. Use functions in versionless wrappers to avoid potential differences in behavior between versioned and versionless commands. Amends e4ac6d0fb83b5086bd0864278fa80204ed279306 Task-number: QTBUG-96096 Change-Id: Idc4ccc6294299d45438c4bf93f56447458948f4d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3d224dc762200e99e04564966c07e3258c393a16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Ensure versionless wrappers do not introduce a new variable scope"Craig Scott2021-09-061-13/+15
| | | | | | | | | | | | | | This reverts commit bda9db56895a8d707638e7e2e4b06c96f59b99c2. Macros add another level of escaping that functions do not. The conversion of the versionless wrappers to macros may alter the behavior, so revert that change. Task-number: QTBUG-96219 Change-Id: I89aea5e11fab8634d942ac5957936a7bce9e5ade Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2060b2b1da6d500685470e79458ac1117c920d97) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-061-1/+1
| | | | | Change-Id: Ifcd1e0a448b3f2bb374ff0a110c01578b50254fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-041-3/+3
| | | | | Change-Id: I6cd31faa609b83ca94543973c4525c8826a93835 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-041-3/+3
| | | | | Change-Id: I5fc3dbda5647c22b2a1d1319a6f0496d594f38e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-041-3/+3
| | | | | Change-Id: I57dda43a3533b735de59703e9d755c23cd2551d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Binary compatibility files for 6.1Milla Pohjanheimo2021-09-033-0/+61529
| | | | | | | | | Binary compatibility files added. Change-Id: I01796815186baf828e626b54ce417972a64a9b38 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit d6d23d4b8199c088f78fde1631e1db457f8de73a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: I48b1997d1dbede76ab0ee89a739778fd37d4f2b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Show Assistant Quick Guide page on first runJarek Kobus2021-09-038-21/+46
| | | | | | | | | Fixes: QTBUG-95125 Change-Id: I8a2344af7c0d1d2bd409fdd1d06f1e30fd7e049b Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 187dee78347500ee9c3a0915f88e42793690f461) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Identify files with the same name in the projectChen Bin2021-09-032-5/+11
| | | | | | | | | | | | | | | If multiple subprojects of a subdirectory project have files with the same name, QDoc will not recognize them properly. It replaces the previous file path with the later identified file. And the contents of the tmpHeader file in the clang_parseTranslationUnit2 function don't contain all files of the same name. Fixes: QTBUG-95981 Change-Id: Ic65f568ea89a6933c155a36f7f374627bff13555 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 77af6b22041ac0f67803ef4fd1d5258a821cd8ff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: I7ed44abb6e44f260b77bd4c8ea1775a328059c63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-021-1/+1
| | | | | Change-Id: I1d019cced584794eac631c9a5bfdbdbe1186f718 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsv6.2.0-beta4Qt Submodule Update Bot2021-09-021-3/+3
| | | | | Change-Id: I7c318155932a29d9798aadf7cd7c4e1785742161 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-011-3/+3
| | | | | Change-Id: Ied08e7c9d8a2a759183eaa093df42b8c8cfbb8b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Ensure versionless wrappers do not introduce a new variable scopeCraig Scott2021-09-011-22/+16
| | | | | | | | | | | | | | | Using function instead of macro prevented the wrappers from being able to pass back any variables set by the wrapped function in the calling scope. Those specific cases were fixed in a separate commit, but this change applies the pattern using macros uniformly across all the versionless commands. Task-number: QTBUG-96121 Task-number: QTBUG-96096 Change-Id: Ibc5fdbc81fcfbde8082a6d46388a068469b32f9c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit bda9db56895a8d707638e7e2e4b06c96f59b99c2) Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-09-011-3/+3
| | | | | Change-Id: Icdbf7b23dc90164eef29b48b51fbc532bfc5a45a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-08-311-3/+3
| | | | | Change-Id: I2cf4093c96d31e2d8635e54c0b72419fff5e7f50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* lupdate/Python: Add support for extra comments and idsFriedemann Kleint2021-08-303-11/+55
| | | | | | | | | | Fixes: PYSIDE-1376 Task-number: PYSIDE-1252 Change-Id: Ie60f86a6c5a771bcdd2ba455fb86cde3cb8f75e6 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 5217a8553f41d43c21755667f7f05064209ee8f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Linguist examples: Fix translator loading codeFriedemann Kleint2021-08-302-6/+6
| | | | | | | | | Adapt to qtbase/74515a7a30b809a3ab0a2d67496e870ea3c872e6. Change-Id: I089970f5e2a7f16ba470aaf4d9e7f1fc9c3e50fd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit d1c6224b2dcbda65ae7588271423dcb335fa7c6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix output argument forwarding of qt_add_(lrelease|translations)Joerg Bornemann2021-08-301-4/+4
| | | | | | | | | | | Make both functions macros to allow for the forwarding of the output arguments QM_FILES_OUTPUT_VARIABLE and OUTPUT_TARGETS. Fixes: QTBUG-96096 Change-Id: Iaec761b12e3330ea728f8797314a7923d4001fa7 Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit e4ac6d0fb83b5086bd0864278fa80204ed279306) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove mentions of the scoping of \target / \l pairsLuca Di Sera2021-08-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | The documentation for the `\target` command states that a target "can be linked *from the same document* [...]". This statement is followed by an example that implies that the linking must be done "from within the same QDoc comment". Other than those assertions being contradictory, they are both erroneous, as a target is supposed to be able to be linked to from any other file in the same project and even from files in other projects, given the correct configuration. To avoid misleading the reader, both mentions of a required scoping for a target-link pair were removed. Additionally, a minor typo was resolved in `qdoc-guide.qdoc`. Change-Id: Id5e84d0baf86f2b32b9cfea33aea82790ed82ab8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 1cbe28aae8d744b725ad8d53887d8fb9b94a0be8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qttoolsQt Submodule Update Bot2021-08-301-3/+3
| | | | | Change-Id: Ibb3ae56c5de160789c90aceaa48ff9e15c262507 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use \versionlessCMakeCommandsNote where applicableJoerg Bornemann2021-08-271-5/+6
| | | | | | | Change-Id: Ic51431f9b4e2de5eda7fe55ba1739327274d71ee Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit cd98292ac5e4728b6b9e00bfd458e94a2d343bd4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove \versionlessNote qdoc macroJoerg Bornemann2021-08-272-6/+3
| | | | | | | | | | | | This macro has been moved to qtbase and renamed to \versionlessCMakeCommandsNote. Task-number: QTBUG-95796 Change-Id: I5392c402727b58385084d6240d5b672f0b40468a Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 5e8d9de173ad59029f31fa5d507b7e52dc52d8d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macdeployqt: deploy plugins also when QtCore5Compat existsMorten Johan Sørvig2021-08-271-1/+2
| | | | | | | | | | | | | | | | macdeployqt determines Qt's libinfix by examining the naming of QtCore.framework, looking for the infix between "QtCore" and ".framework". This worked well until we added QtCore5Compat.framework. Add check to make sure we don't pick "5Compat" as the infix. Fixes: QTBUG-94796 Change-Id: I79b355c19e3826fe1e2a3677e8ec26e1abada11f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 40b329a4b312add7951ddb826ad28eb43c576042) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Conan: Support builds with ConanIikka Eklund2021-08-262-0/+85
| | | | | | | | | | | | | | | | | | | Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Task-number: QTBUG-94815 Change-Id: I5d98fc10847b4608225df4ce7b3a37f718463c6f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 769c8d1c5401dc9e08d37b80a1cd26458bfcd07d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macdeployqt: fix network plugin deploymentMorten Johan Sørvig2021-08-251-1/+1
| | | | | | | | | | The bearer plugin is no more; the tls implementations are now proper plugins. Change-Id: I153e425164089c6d26a0ca642c86c231bb728509 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit cac228499e9456a1e661aced071b65bfd183f3d6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove mention of custom filters, part 2Kai Köhne2021-08-252-22/+0
| | | | | | | | | | Amends 235bbe3f939ce4b44b844ec67389c8a71ceceea5 Task-number: QTBUG-91082 Change-Id: Iade5289503d2c17e849eca1dfe2641aac70d8cfd Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fff99c6e97a094f2fed0a4fa56d3d74800e9c85c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Improve function tagging for grouped \fn commandsTopi Reinio2021-08-2319-33/+127
| | | | | | | | | | | | | | | | | | | | QDoc provides a mechanism for tagging specific function declarations in a header with //! [tag] comments, allowing these tags to be referenced in an \fn command. This feature did not work for shared comment nodes containing multiple \fn commands, however. To make this work, we need to associate the 'bracketed args' (where the id tag is) with the command itself - previously it was stored in the Doc instance, but that doesn't work when there are multiple topic commands sharing a doc. To do so, repurpose the ArgLocPair structure to store the bracketed arg instead of a Location, as we never used this particular Location for anything, anyway. Fixes: QTBUG-95948 Change-Id: Ic899d4252d705f84ba56ea201a55f3e5db068f00 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 76fb767296e12235d93da683a7f2feb84a7a6675) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 08:30:57 +0000