summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't let CMD_VALUE break CMD_TABLE6.5Paul Wicking2023-10-1510-0/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QDoc, if a `\table` command follows a (list of) `\value` command(s), the content of both commands is merged in QDoc's HTML output. This means the table ends up broken. A workaround exists, which is to add a `\br` command to insert an explicit line break after the `\value` entry. This (mis-)behavior was discovered in the documentation for Qt Quick's `Image.fillMode` enumeration (see related Jira issue in the Task-Number footer. The responsible class in QDoc is DocParser. In the handling of `CMD_TABLE`, there's no call to `DocParser::leaveValueList()`, as is a recurring pattern in four other contexts of DocParser's command handling: - After the while/switch in `Docparser::parse()` - presumably an attempt at ensuring it's always called, that doesn't seem to work satisfactory. - At the start of `DocParser::startSection`. - In a conditional at the top of `DocParser::startPara`. - At the start of handling `CMD_IMAGE`. This patch adds a test case in tst_generatedOutput that reproduces the circumstances in which the issue could present itself. QDoc is modified by adding a call to `DocParser::leaveValueList() upon entering the code responsible for handling `CMD_TABLE` ensures correct behavior, where HTML for the value list is terminated properly before creating the new table for the table command. Task-number: QTBUG-115537 Fixes: QTBUG-115720 Change-Id: I06c9c25b4ff792621d56e5eb802178cfd376f8c3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 23fd844bf85f1742751b960fd32e8da4e16fc793) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-10-131-3/+3
| | | | | Change-Id: Ib61f821f76af0491e00bb7b151bb7293dfca3a81 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-10-121-3/+3
| | | | | Change-Id: I72fac67a1f7d74dcc1c58f1d6a53bdb8fcc49846 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix non-existing target error when cross-compilingKai Köhne2023-10-111-2/+2
| | | | | | | | | | | | | | | | When cross-compiling, qt_get_tool_target_name() will actually name the target qhelpgenerator_native. Also, qt_internal_add_tool() might return early, so let's check the target is actually defined. This amends commit 85e769fc36, where the expicit dependency setting was added. Fixes: QTBUG-117974 Change-Id: Id0186e48a31c9410ec594ab0a2c98ec5a0f25fd0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 916277d66ddb7ee932553a80fb82c0dba2b8c0d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 543843551ed78f0d3847e0aca8e1d6282404cce0)
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-10-101-3/+3
| | | | | Change-Id: Ia0e49ac0cfad466f892df3af07fab61ca5a72d55 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-10-091-3/+3
| | | | | Change-Id: Ifab7499a20c8709057c011d1984db68a74412943 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-10-051-3/+3
| | | | | Change-Id: I78a843c6b7b117e4d384a7fb2c4266eb9c0176c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-10-041-3/+3
| | | | | Change-Id: I09250161f84fd71110491a4dc9a4f1db91521446 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Qualify proxy pages with the module nameTopi Reinio2023-09-304-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | When QDoc parses a \relates command, it tries to associate the topic to another aggregate (class, namespace, or header). If this aggregate doesn't exist, a proxy page is generated for the aggregate. These proxy pages act as the output location for the documentation of related non-members that live in a module different to where the actual aggregate is documented. The reference of the actual aggregate will then list the related non-members, linking to the proxy page(s). However, the filename of the proxy page was not qualified with the name of the module; if there were more than one proxy page generated for a single aggregate (because topics in multiple modules try to relate to it), then the proxy pages end up being overwritten in online documentation where QDoc uses a flat output directory structure. Fixes: QTBUG-117510 Change-Id: I4a8b14fe7129ae885b5d2a440b51eee4ee35035f Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 5f91518265e7f818be7f7c77ef1d18a24ca52bb8) (cherry picked from commit bdb18ec1bde8b7cea2c09166b8d2c609602a2336)
* qdoc: Fix incorrect fragment identifier appearing in resolved linksTopi Reinio2023-09-309-38/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resolving a link target for a string, QDoc does it in stages; first, it checks if a target matches a page title. Then, it matches against a stored map of target records that include TOC entries (section titles), \keyword, and \target entries. Finally, a path constructed from the string (e.g. Module::Type::Member) is matched against an API entity. Of these, section titles (TargetType::Contents) are handled in a special way: Instead of returning a match immediately, QDoc checks for an API match and only falls back to the section title if an API match fails. This is done to give a higher priority to API entities over section titles as link targets. QDoc stored the type of the matched item from the map and returned it to the calling function. However, it failed to clear the target type when it found a higher-priority target. This, in turn, lead to QDoc using the incorrect ref (fragment identifier) for the final link target, if the link string matched a section title earlier in the process. To fix, set the targetType in Tree::findNodeForTarget() only when returning a matched Node instance. Streamline the implementation by extracting a recurring piece of logic as a lambda. Remove unused enum values from TargetRec::TargetType - these are remnants that only cause confusion. Fixes: QTBUG-116335 Change-Id: I970c2b121858ad228ef21dead51a3edb30e86450 Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 1f563d2430b3a9e3152d8b4e35bdcef34bb74b36) Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 368045630165ae209cb1985f5f39fad5cdaa4df0)
* QDoc: Refactor XmlGenerator::rewritePropertyBriefPaul Wicking2023-09-301-16/+15
| | | | | | | | | | | | | | | | - Flatten the method by inverting two conditional checks. This allows for dedenting the bulk of the method. - Replace lengthy "or" condition with a QStringList and use of it's .contains() method. - const qualify local variable that doesn't mutate. Task-number: QTBUG-117470 Change-Id: I80d64111bf4a62f0eb2bb6aa4d8ae4cd13d3e28a Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit e549711704b1d6efd79ff743b2f44fc2ebee2062) Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e5912919ab571908c3ba7f11ddbd08cdf1b06fab)
* QDoc: Stop encoding `*/` and `\..\.` in HtmlGeneratorPaul Wicking2023-09-309-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the late 2000s, Java bindings for Qt were released as the project "qt-jambi". This was discontinued at the end of that decade and spun off as an open source project, QtJambi, currently maintained by Omix Visualization (https://github.com/OmixVisualization/qtjambi). When generating HTML output, QDoc replaces certain characters that are reserved in HMTL with their HTML entity counterparts. This is done in the `HtmlGenerator::protect()` method. However, the method also contains a special case that replaces certain characters that /aren't/ reserved in HTML, with their HEX counterparts without leading `0`. The sparse documentation for this special case suggests it is there to satisfy the Javadoc generator. The special case is intended to apply to the sequence `*/`, and to a full stop (`.`) if two full stops occur with any one character between them. Going by the code comment, the intention of the latter is to escape the last full stop in the abbreviations of the latin expressions `id est` (`i.e.`) and `exempli gratia` (`e.g.`). The implementation is rather naive; for the `*/` sequence, the check is buggy (off-by-one error in the check for the characters `*` and `/`). For the spaced dot pair, the implementation fails to take into account its impact on e.g. ellipses or `6.6.6`. The existence of this special case for the Javadoc generator may suggest that QDoc featured a Javadoc generator in the past, which is something it certainly doesn't feature now. It may also suggest that output from QDoc was used as input to Javadoc in some form or another. Since QDoc with Qt 5.15, QDoc features a generator for DocBook, which is more suitable for use as input to some other generation tool than HTML is. This patch removes the special case branch. This may cause QDoc to generate `.` instead of `&#x2e;` in its HTML output in multiple locations. This is to be expected. Change-Id: I45734c11ad5891016dd19b211d54f218c2def3a1 Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 2e06a8546ffbb8fb05817930553f83b35d0a0d55) Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 660c7e29f7fafcee034073db2ebceececd20c352)
* Re-enable generating of the deprecated Designer header filesAlexey Edelev2023-09-293-0/+11
| | | | | | | | | | | | | | | Some Designer header files were, moved to the UiPlugin module. Those header files should remain in Designer module as deprecated, but the mechanism that did this was broken during syncqt refactoring. Restore these deprecated files. Fixes: QTBUG-116483 Change-Id: I72e3770f9114ee81a1dcfff2e3e356fb33d4460f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 59d5f8b694a5472852e85cdaf940390e2c9662e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6eee5c6378d64da216810a3ec70f596379258771)
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-271-3/+3
| | | | | Change-Id: Ie1065dac3c2dfd91f2295c1b506a3c083ab489ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.4Jani Heikkinen2023-09-271-1/+1
| | | | | Change-Id: I6e46a334c1ea485cbfc48150eb6ac18bf3a8d6e7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix meta data of the Qt Designer "Multiple Inheritance" exampleFriedemann Kleint2023-09-251-1/+1
| | | | | | | | | | | Amends db7a30bd1dca12b04f04a2617d54e22c61e5cf70 Fixes: QTBUG-117214 Change-Id: If95937fd606c05c96b6ee83fd9ad73c771a49781 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit f94f39dd2dc69982419bcc8ba49ab77c7c3b4925) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 36c6e1af6c3d8a55df3400ca6fd6576c5dc083a8)
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-251-3/+3
| | | | | Change-Id: I6f5ac7733e215a6200e20a22771b5b9686fd5bfe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-221-3/+3
| | | | | Change-Id: I5f84d170a45cae0aea09c5801e41ae17e1da9502 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-211-3/+3
| | | | | Change-Id: I9af7313446fa1ba4822be1e71e0b8b5876ce4ef9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-191-3/+3
| | | | | Change-Id: Ib1134eec916039cd3e8808665e38847e0a118ae1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-181-3/+3
| | | | | Change-Id: I923d3af1986fcf048cbea35a2bfa03f0b79d32c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-141-3/+3
| | | | | Change-Id: I0dc0552411a4bf7536874161661f6b83d0213307 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* lupdate: remove number heuristicsLucie Gérard2023-09-1312-285/+20
| | | | | | | | | | | | | | | | Adapt the troll print example [ChangeLog][lupdate][Important Behavior Changes] Removed the number heuristics feature. Users are advised to avoid hard-coded numbers in translatable strings and use QString::arg instead. Task-number: QTBUG-115962 Change-Id: I64e920e7b6496924f2c1ee6d07bea6e73964177a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit cda38d3d08e689deab506a11ed8c54a04d3f40d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit de619b5eec88a677e51d206fb32b5eb47a018108)
* Add ts files in arrowpad exampleLucie Gérard2023-09-133-0/+9
| | | | | | | | | | | | | | To avoid git complaining about untracked files, default ts file created by cmake are added. They still have to be updated like explained in the examples documentation. Task-number: QTBUG-115686 Change-Id: I8b57c4c7e6920e1dcaed8dba7dda4f7088fa604b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 3f16bd02ae50561a6965dae6efec3878801f5e0e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9d201a41af62a9559fa242846c60b4d5e11faa03)
* Change qtattributionsscanner to accept string arrays for CopyrightLucie Gérard2023-09-121-2/+34
| | | | | | | | Task-number: QTBUG-111873 Change-Id: Ibdc03955d6e5942deb6dab37a70fdaefec68ccec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 687bbd584cc36fb8d213cb99a9098178e3701ce8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Tests: Remove unused symlinkKai Köhne2023-09-121-1/+0
| | | | | | | | | | | | | | | The link got added in d012c2f69, and leads to issues on Windows, for instance when extracing a source archive: Cannot create symbolic link : A required privilege is not held by the client. : [...]qt-everywhere-src-6.5.2\qttools\tests\auto\linguist\lupdate\testdata\good_testing_all_fixed\parseqrc Anyhow, it seems unused, so we can as well delete it. Change-Id: I6a04d0c0eb95f8f06e7d88badfe87a966ab960d0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 51c0fa09e9f221e13c3a83fe9403035778c0ad2f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-121-3/+3
| | | | | Change-Id: I7bcd5dd8db08eba7f31f66247be8f9ffb562d05f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add example category to qtassistantInkamari Harjula2023-09-082-0/+2
| | | | | | | | | | Added category Desktop to remote control and simple text viewer examples. Task-number: QTBUG-116536 Change-Id: I42c196bb6a9f8a402e87f6055bf05eb99603eca1 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 01fd39641c9eb9a596a6f8314e60aa7136908bfd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Support explicit list of example categories in manifest fileKai Köhne2023-09-074-0/+26
| | | | | | | | | | | | | | | Examples currently implicitly define the list of all available example categories. Add support for an explicit list that defines an order between categories (to be used in the QtC welcome screen). A list for the Qt example categories will be defined in qtdoc. Change-Id: Ia9dfd0b55e4b4063641e72c1d55574743610b164 Reviewed-by: Eike Ziller <eike.ziller@qt.io> (cherry picked from commit 2277cf896c58fc0f2f61a2ab21903d8b710af225) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-061-3/+3
| | | | | Change-Id: Iaf13802dbaa0414e7d0907a81266f07086df9ca7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add example category to qhelpInkamari Harjula2023-09-061-0/+1
| | | | | | | | | | Added example category User Interface Components to contextsensitivehelp file. Task-number: QTBUG-116534 Change-Id: I112c2710df7c93b4282f7192ddb06e84e097d14a Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 58b16c4b0b325b4927ca5d03278576d0bd7775f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rename qt_attribution.json test fileKai Köhne2023-09-062-1/+1
| | | | | | | | | | | qtattributionsscanner features a 'test mode' since quite some time. Let's also use it in tests/manual, so that scanning the qt source code doesn't bring up this 'test attribution'. Change-Id: I6e3ae4ee91bad42bb57a07a84dfcbbab75e1e537 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ed550e572dacc7c244813c4fcbffef9fc1b8f06e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-041-3/+3
| | | | | Change-Id: I8d3e88aba36f86e39a31e37443f872ea0a4440c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-09-011-3/+3
| | | | | Change-Id: Ic0a6930976a182187a9273eb09b016ce1ce26938 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Ensure a group is listed as part of the navigation barTopi Reinio2023-08-316-69/+57
| | | | | | | | | | | | | | | | | | | | | | | QDoc adds a link to a documented \group as part of the navigation bar if a page uses an \ingroup command. However, this happened only if there was exactly one \ingroup command used. Pages can belong to multiple groups. Often, the \ingroup command is used for grouping pages for use with \generatelist or \annotatedlist commands, without any associated \group page. Adjust the logic for resolving the group page link on the navigation bar; select the first one that references a documented (and titled) \group. Document the automated link generation for \ingroup, and touch up the related documentation. Fixes: QTBUG-116441 Change-Id: Ie773ac4f52733ca2a9ade04c96101e05ef05c0cb Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 2b2ac8e4aacadb4461697600f95b33815b519bef) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-301-3/+3
| | | | | Change-Id: Ia4581104f86b75fee07e37ca86d77977620eb7da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing closing tag in ts format snippetLucie Gérard2023-08-301-0/+1
| | | | | | | | Fixes: QTBUG-115578 Change-Id: Ibe2093ec0275d8f76360f814ae81f62ef5650f11 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e5b3018af6727b5966a4bf0493b74297cafda891) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-291-3/+3
| | | | | Change-Id: I375e95467f39a998f2e88a20c83df5f5bd0fdc2b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-281-3/+3
| | | | | Change-Id: I2342cce2f25a8e9f3895c5308f8ff263b84d0a9f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-251-3/+3
| | | | | Change-Id: I753e031ebbca6c9d8308ac3133368eb5cf38b594 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-241-3/+3
| | | | | Change-Id: I80fb74a91b4e969978f683c5778c3622bba7f05b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-231-3/+3
| | | | | Change-Id: I40702d116e23070bb3aa9ef8ccc59bae704eb1f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-221-3/+3
| | | | | Change-Id: I6e4621cf4594dc2b1e2d6ce2d99ec2d666449f65 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Fix layout alignment context menu entry enabled stateFriedemann Kleint2023-08-221-1/+1
| | | | | | | | | | | The action remained disabled when triggered a 2nd time after being invoked on a non-laid out widget. Fixes: QTBUG-116305 Change-Id: I78badb41fb82a94f9e5ee3d8f7a99f9127c90bc7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 3ee45500e316d74c2dbb09b3e450456c2d9b2789) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix missing arguments in Node::signature() outputTopi Reinio2023-08-2219-39/+109
| | | | | | | | | | | | | | | | | | | | | | | As part of a previous cleanup commit 4c3108e5c2, an overload of Node::signature() was introduced. This overload took two arguments, but it was not overridden by FunctionNode, causing the base implementation to be called at multiple call sites. This base implementation simply called Node::plainName(), causing a plain function name to be listed instead of the full signature that includes argument types and names. Remove the problematic overload, and modify the remaining signature() to accept a single argument; a new flag type that controls the parts to include in the reconstructed signature. This makes the call site code more readable, compared to three boolean arguments. Add a test case for the \reentrant command as this problem (missing arguments in the signature) was associated with its output. Fixes: QTBUG-115116 Change-Id: I70352532297b25b4c38249c0a724050cad47b07f (cherry picked from commit e47cb8bb01dd450d00937520022f25dd3d34dde0) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-211-3/+3
| | | | | Change-Id: I772afbbec5e8d46296b11d357a934f3d7ff571d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-161-3/+3
| | | | | Change-Id: Ia6e5c1bb61acf2a26e144ff1f9832372f441a151 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-141-3/+3
| | | | | Change-Id: Ia7d7515e6108204b72c39375b92c28a9f3bdbbee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-08-111-3/+3
| | | | | Change-Id: I51448b8236a6d4cfac11afd9168c16232dfed2f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Remove dead code from qt6_add_lreleaseJoerg Bornemann2023-08-091-4/+0
| | | | | | | | | | | The variable lupdate_command is not used anymore and can be removed. This amends commit 2e1b5267136228d76b5ceb4c5b212a16ddafed58. Change-Id: I6cf83406870365bbcad34bcac1def71a39e274dd Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 7b109be80f51062797c94708288433de11c10cb5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 18:15:36 +0000