summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Doc: Remove mention of custom filtersPaul Wicking2021-06-241-40/+6
| | | | | | | | | Fixes: QTBUG-91082 Change-Id: I5610667072b618d8d0597e618f872266e4397536 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 235bbe3f939ce4b44b844ec67389c8a71ceceea5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-221-3/+3
| | | | | Change-Id: I97fe5c3565d0120449825637100125dc4677c803 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-211-3/+3
| | | | | Change-Id: Idf16bc20d08ee142c00306c28bebe272c44f5dec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-211-3/+3
| | | | | Change-Id: I2bd0d0f6b1a600babe8f4efde550465a9976b222 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-211-3/+3
| | | | | Change-Id: I972715afb74f79c651a241384ec5928cd4333d48 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-181-3/+3
| | | | | Change-Id: I1d302c3abcd55d9e46ef4d6c92f76fc349a28134 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Stop documenting ignored nodesTopi Reinio2021-06-1718-81/+98
| | | | | | | | | | | | | | | | | | | | | | | | There were multiple locations in the code where QDoc still generated links to nodes that were marked with \internal or \dontdocument, or generated lists that included entries (with links to non-existing files) representing these nodes. * Set an empty (but non-null) url for ignored nodes. This also speeds up searching for link targets as nodes can be dismissed early based on their url(). * Use Node::isDontDocument() as a conditional in Node::isInAPI(), and filter CollectionNode's members based on the latter - this removes ignored classes/functions from module pages and group listings. * Fix TagFileWriter to drop ignored nodes. Fixes: QTBUG-94555 Change-Id: Icab05f7aa78e455c15ce097b9f99f5fce7267d3f Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 1246e064caaa6243c941d795eb877c519bce69ad) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-161-3/+3
| | | | | Change-Id: Id02f96361b5f73c653ac1cdc572e658cdacf39bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-161-3/+3
| | | | | Change-Id: I6006c9c699fd3af3a8ffbdeeabf0a3202f349579 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-161-3/+3
| | | | | Change-Id: I9146f087b38dc86f0ecd488ffb45254ee8334237 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-151-3/+3
| | | | | Change-Id: I37c76241aac19380fcbc98809b4f292f9b761241 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-151-3/+3
| | | | | Change-Id: If0ce2cc31f83747bb162651d32c5ebe7f4df64dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Move qtattributionsscanner to libexec" for 6.1.2Kai Koehne2021-06-152-2/+1
| | | | | | | | | | | This reverts commit 4c2614611612a054a981144209d1295e37bcaf04. Reason for revert: Let's keep this for Qt 6.2 and following releases, and not do it in a patch level release. Fixes: QTBUG-94510 Change-Id: Ic698100b0a1440dc6c0e8c3b16394fecb991862c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-151-1/+1
| | | | | Change-Id: I48ac32d49e84423a6c577bd0382671633c047bc6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-141-3/+3
| | | | | Change-Id: I64e964bd78df00c0869f4c5469c55c66dd260204 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Assistant: Make QResultWidget linkColor styleableJarek Kobus2021-06-141-6/+18
| | | | | | | | | | | | | | | | | | Add a property "linkColor" of QColor type to the QResultWidget class. Now it's possible to style the link color in search result widget through the following stylesheet: QResultWidget { qproperty-linkColor: red; } Fixes: QTBUG-74353 Change-Id: Ife57b5a64154be83f6eab4ef533840c51aefd1f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 178313751273284b1f0167391af721f006a677c5)
* Qt Designer/Windows: Fix crash when instantiating QQuickWidgetFriedemann Kleint2021-06-141-0/+9
| | | | | | | | | | QQuickWidget requires OpenGL RHI. Warn and disable it when another API is used. Fixes: QTBUG-94345 Change-Id: I92b273957ace41d2f5d714ca87ea47c32d3922ec Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 2adb1111e2320b53879600fb932a490b3ab0d332)
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-121-3/+3
| | | | | Change-Id: Ic81d9e4a7d9b2d097c199163174befc5f6ba0592 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-06-082-2/+2
| | | | Change-Id: Ie1065cc14ca7c1f1bae846b89bb049757746243a
* qdoc: Fix MSVC warning C4267Kai Köhne2021-06-011-2/+2
| | | | | | | | | | Fixes qdoc\clangcodeparser.cpp(1652): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data Change-Id: I2a123415ef61f1427690ae798cbe658895e2e668 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit b1c6a4f6d9a9e39830636389a74ef3fa847afcba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtattributionsscanner: Fix inclusion of CopyrightFile contentKai Köhne2021-06-011-1/+2
| | | | | | | | | Amends 4d3c39155 Change-Id: I2c518bddcc7eb8ae525551c0712604fced700f16 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c69d521b6702f7b51d0595512b7f6a79f4062e05) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-011-3/+3
| | | | | Change-Id: I65f753eeb495e400313e9f4ccbddb63198fd35be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-06-011-3/+3
| | | | | Change-Id: Ib5a3dcad67f988ad7f69ddf223eaec3c3ed7666c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-311-3/+3
| | | | | Change-Id: Iae16fa5fb20042ab76c582afbefa51213f037096 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-311-3/+3
| | | | | Change-Id: Ieeff6665642810e71c873035b335b44651e95644 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Move qtattributionsscanner to libexecKai Köhne2021-05-312-1/+2
| | | | | | | | | | | | | | The tool is only used for building the Qt documentation, and not documented. This requires a follow-up patch in qtbase. Task-number: QTBUG-88791 Change-Id: I4a37249087a890e7fdb47ed6a2d89daec43d74dc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 0861ee9e695300645e098c331428ae3a256e74e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-311-3/+3
| | | | | Change-Id: I268066ab06abdfae95a96f2a4f0b567db87e05d5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-281-3/+3
| | | | | Change-Id: Id5a3911d1361fce56639c6e30b21f1a2b3729595 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-281-3/+3
| | | | | Change-Id: I161f47275fdbcd41c7cb3042fdbe7683ad6c1ca4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-271-3/+3
| | | | | Change-Id: Icae39a312210c5d8c4a8b76788ba460bb00228cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-271-1/+1
| | | | | Change-Id: I8002bc74964f01b7ed35ff6192dfec0bd55a144e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-255-1047/+275
| | | | | | | | | Task-number: QTBUG-86726 Change-Id: Ibea15ff714958ad3e70a8b86ae8c6c18c94ccf16 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d6c98c9afcdabc0a427cfb5e885f5f900c572be7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-241-3/+3
| | | | | Change-Id: I4c9c753b01a6116abdafc9b6ce8562db40b8865b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-211-3/+3
| | | | | Change-Id: Id83c9bbe25df9630b6792a025572f9622f65b80d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-201-3/+3
| | | | | Change-Id: I8f426b2f0e5969bf7d33e231f12bff11ea31b9df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-191-3/+3
| | | | | Change-Id: I0e025da23ca243ff2842b985759eabfa750d198f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: Ife55b28e3b0f76559f2e097d219c7093891a97f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: I5fd3b628502ae53ca7841652a70f66528409f9d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: Ief971602779b7055f3f08b5b23e59aab99065439 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-131-3/+3
| | | | | Change-Id: I37246cb5350e44ddd3a5b142c18badb0b38fb240 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-131-3/+3
| | | | | Change-Id: I3509a61033d2535381bab1da84478ba01d4d5025 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: I62fc244947bb86d5fb97cb3db6eae218ff57e254 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: Ia067d86cf2de4b9707ba128d47ff9785b1cc40c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: I6d8cca98df6b5c6b1542602e2a082b6945d0a185 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: Iad7ff5437822c30f2e52a810e9405ccfb404bfa9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: Ifa0c0cdfe3e42bf947fe1995d400c612fe33e516 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-111-1/+1
| | | | | Change-Id: I1e29a4be05968b79fa0b856209243702c4922b81 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: I56de78be9367b25ad991979f264ce7107bcbdc58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-05-072-2/+2
| | | | Change-Id: Iffbadecb582f3b516d5d4ab097be585d73f3a988
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-05-071-3/+3
| | | | | Change-Id: I30e7d4c49a27ae97596770c49ffe22b27f7daecb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>