summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4.0' in qt/qttoolsv6.4.06.4.0Qt Submodule Update Bot2022-09-231-3/+3
| | | | | Change-Id: Ibc384bfa8a5031a5f99e92c48bc0fbe804e14602 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qttoolsQt Submodule Update Bot2022-09-201-3/+3
| | | | | Change-Id: Ie9b17947764bec8f2cdb62979f377758ace5dd11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qttoolsv6.4.0-rc1Qt Submodule Update Bot2022-09-131-3/+3
| | | | | Change-Id: Iacc783abecaa7726304f5458300c9194b2ea2431 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qttoolsQt Submodule Update Bot2022-09-121-3/+3
| | | | | Change-Id: I3291b90d113c33b0ab7eda376aa53a4b8ce0c536 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qttoolsQt Submodule Update Bot2022-09-091-3/+3
| | | | | Change-Id: I27cf1682c9f7d42143481dc4880230673255b509 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qttoolsQt Submodule Update Bot2022-09-081-3/+3
| | | | | Change-Id: I365f751a4d210e63c380696bfe518fdecb429d9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use registerRef to ensure xml:id validity and unicityThibaut Cuvelier2022-09-028-54/+68
| | | | | | | | | | | | | | | | | | | | Before this change, invalid xml:id were generated: - duplicates (several tags having the same xml:id -- not several ones pointing at the same ID, which is fine) - invalid characters (mostly spaces) - IDs not starting with a letter or an underscore (in particular, digits are not allowed in XML) - colons in IDs. Only few occurrences of this problem: - https://doc.qt.io/qt-6/qglobalstatic.html#operator-QGlobalStatic::Type--2a - https://doc.qt.io/qt-6/qflags.html#operator-QFlags::Int A flag controls the changes that are applied on IDs, so that there should be no changes for HTML IDs (very lax). Furthermore, stop using registerRef when it is not needed and clear the set of generated xml:id for each new document. Change-Id: I53b08ae884a4e360ff4287fd486e24fb17b3deb2 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 7d0e52a85b75ac5883616c5ca1c71565508087ab)
* Don't let \C and \Formatting collideThibaut Cuvelier2022-09-021-1/+6
| | | | | | | | | Previously, \C could output a <db:code> within a <db:code> opened by formatting (which is not valid DocBook). To solve this issue, it is necessary to remember whether a <db:code> is currently open, in m_inTeletype. Change-Id: I3f04c96b1d541610fa119668b2906a7fc424002e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit ee64774559478596db3665793c46f5da3aaf7147) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revamp support for formattingThibaut Cuvelier2022-09-022-7/+32
| | | | | | | | | | | | With more details: - Implement subscript in parameters indicated with _ - Implement \uicontrol / ATOM_FORMATTING_UICONTROL - Add a warning for unsupported formatting. These new warnings mostly indicate where qdoc should be improved. Change-Id: I7a31e095e3a1a40c2f99e34a0dbc97f55bf3e081 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c94077d477c6087c040316edfe6f92d011ffc3ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix several issues regarding duplicate/empty xml:idThibaut Cuvelier2022-09-011-5/+49
| | | | | | | | | | | | | - Don't output an anchor in a table (except in cells). This is not valid DocBook and will likely never be: https://github.com/docbook/docbook/issues/233 - Output anchors only when their ID is nonempty. This behavior seldom happens when the original \target is empty, which is often a problem in the original file being documented. - Avoid xml:id clash between a \target and a \section. - Simplify the code: maintaining a pointer to the next atom is not relevant. - Improve detection of empty table rows: some tables include keywords between a \row and the first \li, like qtdoc/qmlapp/debugging.qdoc. Change-Id: Iece9a2236741e307995e357e3a2e7f674a16e66f Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit d1ee606afacbc0b1677263f2d425c686d3233847) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Fix build with llvm < 10.0Kai Köhne2022-09-011-0/+1
| | | | | | | | Change-Id: I680861e69c04b32a660d3b087a1e4d1c1428327f Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit f742e97665c0748ca3681ff93c23cce8d2ce27b3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtattributionsscanner: Allow */ to appear in license textsKai Köhne2022-08-311-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | License text files might contain */ (end of C style comment) , for example when explaining how to attribute a license in a file. So far, this broke the qdoc output, because qdoc also looks for */ as end of documentation marker. Work around this by masking the star through a qdoc \badcode argument, so that */ becomes \badcode * \1/ \endcode Change-Id: I77310ed272177eaa69e354c0d7bce380ee933e56 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 047aff2add055bd5370fecfa98c371b5197beeed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc manual: drop extra backslash in macroPaul Wicking2022-08-291-1/+1
| | | | | | | | | | I'm pretty sure this was intended to use the macros, not show the macros in rendered text. Change-Id: I3ea75df206e6b43cb7fec606dabdf9bd3b9564db Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit f32b27c8dd8b18081572957b51f268eb69480e36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Generate briefs also for QmlBasicType pagesPaul Wicking2022-08-292-0/+4
| | | | | | | Change-Id: I10fd907492b9bb684a00c6e374cedef94ad89799 Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit dc13c124db1b667a96147c5bb3cf263aa0dfb51e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc manual: improve Clang for QDoc sectionPaul Wicking2022-08-291-9/+14
| | | | | | | | | Reflow long lines as part of edit. Change-Id: I73652a5a769918845f16d24a3d8673038f63bb85 Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 364c843f67a0bac7b1a4c9112a38c631dd2d4ea5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make order of sections in .qhp file deterministic (take 2)Kai Köhne2022-08-291-4/+6
| | | | | | | | | | | | This amends 9aa6307ccee1. It doesn't help to sort the input list, if the filtered result is then stored in a QSet. Fixes: QTBUG-105987 Change-Id: Id187b8ce974b4d9f4bffc3431ecb96077af9bb8c Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 8241d7482cacf851e33b5703a49cabf4e61038d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsv6.4.0-beta4Qt Submodule Update Bot2022-08-261-3/+3
| | | | | Change-Id: I6426940efa6037d3bfc537981bdc24f413b2d29b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-08-251-3/+3
| | | | | Change-Id: If5db4fd08f350a4e86488167fa461cd5f8618652 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Don't mention qdoc's cpp.ignoredirectives, cpp.ignoretokens anymoreKai Köhne2022-08-222-116/+2
| | | | | | | | | | | The settings are noops since the switch to clang backend. Task-number: QTBUG-104903 Change-Id: I09b62c242e8d6fd8613916e33df786da313e6634 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit e69aa186087ff15cb765f0f7604b07ffe7fdb4e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Handle macros while generating since infoVenugopal Shivashankar2022-08-227-6/+9
| | | | | | | | | | | | | | The generator treated macros as a function/method, resulting in a since entry that referred to the macro as a function. In addition, updated test data to ensure that the since entry for a \macro is tested. Change-Id: I648511705babad84163bc3e0ebd8233c4d46f4e2 Fixes: QTBUG-105097 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit fffdb06383ff9aa29bcd1988cb19ca3e927bd224) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-08-221-3/+3
| | | | | Change-Id: I28228a0c46536a0fc2173ad13fc25b0985b723a0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Refactor to use generateSimpleLinkThibaut Cuvelier2022-08-211-5/+1
| | | | | | | Change-Id: I2b83c298ccea470156867bfab44c795b10da49cd Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 3aa0ace3b10e8e24239e07edc854105467aa31bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QWidget::activateWindow() instead of QApplication::setActiveWindow()Tor Arne Vestbø2022-08-182-2/+2
| | | | | | | | | | The latter is meant for the internal window activation machinery in QtWidgets and should not be called by user code. Change-Id: I8cd750408b279c53c8a372164692260a15d133e8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e0b80ec2e1a28d2977bfd2242a01b16ae99164b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-08-181-3/+3
| | | | | Change-Id: Ida3035003d5c2802fcdda98e711a0f576802a233 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix several more improperly placed #include mocThiago Macieira2022-08-171-2/+2
| | | | | | | | | | | | | | Like commit qtbase/638893bea083b619b73b33a7dd5589fb2c4c4242. Script to find them: git grep -l '#include.*moc' \*.cpp \*.mm | \ xargs awk '/QT_BEGIN_NAMESPACE/ { i=1 } /QT_END_NAMESPACE/ { i=0 } /#include.*moc/ && i { print ARGV[ARGIND], $0 }' Change-Id: I6f936da6f6e84d649f70fffd17058fd05cfc5c6d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 9b285b1a18fc90f5b3ab36bda0202fa222ec21aa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-08-161-3/+3
| | | | | Change-Id: Id9e6bb1068ddaa69ff91c00c2cc25b1ed22b5f6c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix a common mistake when setting table sizeThibaut Cuvelier2022-08-111-1/+15
| | | | | | | | | | | | | Wrong: \table 100 % Right: \table 100% Parse the first one as if it was the second, with some defense. Change-Id: I418c13c633ec474b5fc689aa9826bc1406a04c6b Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 201c9908fa10adc25877069f9ccc4bd7dfecf9e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsv6.4.0-beta3Qt Submodule Update Bot2022-08-111-3/+3
| | | | | Change-Id: I00491baec38bf689789cec689c782fbd2cf7b648 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove references to m_numTableRows in DocBook generatorThibaut Cuvelier2022-08-101-3/+0
| | | | | | | | | This variable is not used at all for DocBook. Change-Id: Ic148702100c9848d9208f556448593bb623a4618 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8cbe0deec9da1025514c0cab380b772ae5bccaa4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace occurrences of QPair with std::pairThibaut Cuvelier2022-08-091-5/+5
| | | | | | | Change-Id: I5827e23bf4d2e4df31a4309c9d54db0496c36331 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8afe81bd980e8134981c90e9ca0cd159a474e91a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Avoid losing output for unlinkable AutoLinks in WebXMLGeneratorLuca Di Sera2022-08-091-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc recognizes a series of words that it finds in documentation blocks as "AutoLink" candidates, as per the rules in "DocParser::isAutoLinkString". When an "AutoLink" candidate is produced, it will later, during the generation phase, tentatively be resolved as linking to an element of the documentation. When this tentative linking succeeds, generally, it will generate a link to the found element in the output documentation, falling back to outputting the word if that is not the case. In the case of `WebXMLGenerator`, the code structure that takes care of resolving an "AutoLink" output, in `addAtomElements`, had a structural defect, such that it would completely erase the "AutoLink" candidate from the output if an element could be associated with the "AutoLink" without producing being able to produce a "target" string for the found element. That is, the current point of access for resolving an "AutoLink", `XmlGenerator::getAutoLink`, seems to be able to recognize an element that the "AutoLink" candidate refers to, without necessarily producing a link to the found target. The states and reasons for which this happens are currently unknown and should be addressed separately. When this is the case, `AddAtomElements` would try to produce a link, fail to do so and not fallback to writing the bare candidate. In the more general case where a link was not produced because no element that could tie to the candidate was found, the correct fallback was generally chosen. To avoid the issue, it is now ensured that, indepedently of there being a link or not, we always write the raw word for the candidate, either as the link text or as an unlinked raw string. The scope of some variables that were used during the processing of an "AutoLink" candidate in `addAtomElements` was slightly expanded to allow the flattening of some of the branches around them. Fixes: QTBUG-105278 Change-Id: I265095cf42bf530878a6f741043ccbc7ee4cbb09 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3315e0deb50c11c2a2c6461656f407da9619de92) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: prefer std::pair over QPairPaul Wicking2022-08-0913-35/+31
| | | | | | | | | | | | Following the replacement in DocBookGenerator, replace the use of QPair with std::pair across QDoc's code base for consistency. Change-Id: I2fc9f5f730a1bc570133b07d9eabad56d27ed9e8 Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Thibaut Cuvelier <cuvelier.thibaut@gmail.com> (cherry picked from commit 2be66f9f8f609bc3cbd467ccf73b7ecfcad19c55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Introduce a single function to write xml:idThibaut Cuvelier2022-08-092-18/+28
| | | | | | | | | | | This need arose from comments in 419991. Its main goal is to improve code quality by merging all identical code paths (or code paths that should be identical but were not always). Also, when copying attributes from some HTML, treat the ID as an xml:id. Change-Id: Ic5d4430d59999a00a4ecd7cd6b2a0d85c6e6bef2 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit be62c92b72f30c6d6cad0ac1ba662b8eab527d5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove a useless overload of startSectionBeginThibaut Cuvelier2022-08-092-9/+1
| | | | | | | | | Rely on a default value for the parameter instead. Change-Id: I1d333390c4470848cb82ac62364baddff5bea7fc Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8285ebe64b2eca8d824655ad6f4c38af95f3b88d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-08-081-3/+3
| | | | | Change-Id: Ib75ec96ed51d5e3a6f60f21ebaae4e8693b32af8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-08-021-3/+3
| | | | | Change-Id: Ia045a9335ae70022c6e0fa6cfe15459f3298c264 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-07-281-3/+3
| | | | | Change-Id: I9c9c6824736c332f7ce3fe1609f4401e3b23cd50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-07-271-3/+3
| | | | | Change-Id: I6a982c74f3f165d6bae8e69bde164345c79bd51c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: QDoc Manual: Document the examplesinstallpath qdocconf variableTopi Reinio2022-07-252-9/+61
| | | | | | | | | | | | | | This variable was briefly mentioned in the breakdown of a sample .qdocconf file but not properly documented. Add a section for it in the list of variables. Clean up the sample .qdocconf file in passing. Fixes: QTBUG-104633 Change-Id: Icf8ee395f1add63e6382e1f0c715b22f4f3bc7c6 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 32be6fc6e8d7e66dca2c70359647cc7f0c917210) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-07-251-3/+3
| | | | | Change-Id: I37713f24094206bc31c192f895d105f3f21a6ece Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix build with system litehtml and gumboAlexandru Croitor2022-07-251-3/+11
| | | | | | | | | | | | | | We can't set compiler flags on already built targets. Only set them conditionally on if the targets are available in the assistant subdirectory scope. They will only be available there when litehtml is built as part of qttools itself. Fixes: QTBUG-105130 Change-Id: Ie56ecf2b453d03147dde95aa04434a988febd4da Reviewed-by: Moody Liu <mooodyhunter@outlook.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit efa979b053d0084632bdff6b1d0d9860fd881ced) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add missing dependencies to qtuitools.qdocconfTopi Reinio2022-07-221-1/+1
| | | | | | | | | This resolves the link failures to CMake and qmake manuals. Change-Id: I8ae80cd0dc70f03fe7b6874d71764e97d5c68d72 Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 0cc77ba946d9fd2e977bf2b0dad5bf1c90d158f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QHelpIndexWidget: guard the usage of deprecated signalsIvan Solovev2022-07-211-0/+4
| | | | | | | | | | ... so that we could compile the code with QT_DISABLE_DEPRECATED_BEFORE Task-number: QTBUG-104968 Change-Id: Iee39a3a5af51b6f9b02fa0eccac3f15aaceb778d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 9d8aa919e681ff27fab97efabfe1b43338eb6048) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Assistant: guard deprecated method definitionsIvan Solovev2022-07-212-0/+10
| | | | | | | | | | | | The definitions of the deprecated methods were not guarded by the QT_DEPRECATED_SINCE() check, which causes compilation errors when trying to get rid of the deprecated APIs using QT_DISABLE_DEPRECATED_BEFORE. Task-number: QTBUG-104968 Change-Id: Ifa44058f866e000ace75046a850906e170d04731 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 2af4532e3367d0704ea965c262cf2f2e22256a68) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Designer: port away from the deprecated QAction APIsIvan Solovev2022-07-218-38/+54
| | | | | | | | | | | | | | The deprecation of QAction::associatedWidgets() results in a bit more code, because the list of associated objects can also contain QGraphicsWidget instances. So we need to explicitly qobject_cast them to QWidget* before using. Apart from that the changes are rather straightforward. Task-number: QTBUG-104968 Change-Id: I2e7c94de069cd5c9cde5e6d41ac86004a8bae6c9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ca8a71e1997650a0ecf497d667cfab5a72858c18) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Do not advertise Qt module includeKai Köhne2022-07-218-39/+0
| | | | | | | | | | People should rather use class includes, like they are advertised in each class documentation. Change-Id: Ic0d24553432a02212feb63e25eb8695a374604fc Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit ea3365ef1f9338cf534e8840a2d1f1c5a23c03c0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make order of sections in .qhp file deterministicKai Köhne2022-07-211-1/+2
| | | | | | | | Change-Id: I0a07d5cdf3598f75f2f9a25a66478774c863a214 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 9aa6307ccee117a09362e95e6c7034ae78c58413) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Revert "qdoc: Prefer CMake example project files over qmake .pro files""Kai Köhne2022-07-192-2/+3
| | | | | | | | | | This reverts commit 04498ffe04903859715122f8349900448f837c26. Android and iOS support in CMake should be now in a good enough shape. Change-Id: I94b5c4b7fc1d47d777b8570a554f11b5fc9cacec Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit bef57457e59171f7fb06aecb5e0f951201581c0a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make order in tags file deterministicKai Köhne2022-07-192-110/+111
| | | | | | | Change-Id: Ic63ad2d1735c288342c5558718c7568e2961979d Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit faeb8d4792e0f88c3ece0c8eead1abf65996a171) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qttoolsQt Submodule Update Bot2022-07-191-3/+3
| | | | | Change-Id: If8ea7ea25061dd8f373c827791cf968649a08c67 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status