summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* qtdiag: only print "Q_" and "QT" environment variablesThiago Macieira2023-12-041-2/+4
| | | | | | | | | | | | | | | | | | | | QEMU is not Qt: Environment: QEMU_AUDIO_DRV="pa" QTEST_COLORED="1" QT_AUTO_SCREEN_SCALE_FACTOR="0" QT_FORCE_STDERR_LOGGING="1" QT_IM_MODULE="xim" QT_IM_SWITCHER="imsw-multi" QT_MESSAGE_PATTERN="[%{time boot}] %{if-warning}%{endif}%{if-fatal}%{endif}%{if-critical}%{endif}%{appname}(%{pid} %{threadid})(%{function}):%{if-category} %{category}:%{endif} %{message}" QT_SCALE_FACTOR_ROUNDING_POLICY="Floor" QT_SCREEN_SCALE_FACTORS="2;2" Change-Id: Iae41eb8991e349ceb836fffd179cbd3d757614cf Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> (cherry picked from commit 27823a51a9ca8c724efee46b722f484d08cde962) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-12-011-3/+3
| | | | | Change-Id: Ic2a815a4ff94a0b73ee1d844560681ae1945c5e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-11-271-3/+3
| | | | | Change-Id: Ic1377cdffaf0c3ae731db4ef313fbf4947638231 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* pixeltool: Fix some clang-tidy warningsFriedemann Kleint2023-11-223-13/+11
| | | | | | | | | | | | | | | | - repetitive includes - repeated type names after new - static functions - Use QFileInfo::exists() - Use constFirst() - Pass small values by value - Implicit conversion to bool Change-Id: Ie74cd86f20b18ce8b4ee3eaa8d6e5fa0c83f2c83 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> (cherry picked from commit e1eb33fee80f11423a079063b3a9c02f585fac19) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* pixeltool: Port to string literalsFriedemann Kleint2023-11-222-50/+62
| | | | | | | | Change-Id: I054fdb71b1f0b8e08f0d582030629fc223c29aa2 Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit bdecc226c34dad33764726763985d6cbfac473da) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-11-211-3/+3
| | | | | Change-Id: I3fe3d9c69f60bc980f16534de6569339989efb42 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* pixeltool: Fix black display when grabbing other screensFriedemann Kleint2023-11-201-22/+23
| | | | | | | | | | | | | - Pass a position relative to the screen origin for grabbing. - Scale the grabbed pixmap such that it can be rendered with the DPR of the widget. Pick-to: 6.5 Change-Id: Iaecfc1cccb2f4b18067370bdedcefdc5a0fcf557 Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit eb672bc3f1b99ca4a19237de28ea72f33514e7f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Refurbish the custom widget exampleMatthias Rauter2023-11-172-17/+40
| | | | | | | | | | | | | The custom widget has the appearance of the analog clock, which was refurbished with 619ec1a6406a8be7bfa9d96b9e693e7a3323d8dc. This change applies the refurbished design to the custom widget. Task: QTBUG-118871 Change-Id: I4a751a54d91d7eaa13f2282a9f1a1a26d91a204c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b420e7aeb5327b4ee7c5de85cfa6ecbe050cab0d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-11-171-3/+3
| | | | | Change-Id: I721c65e146b468bcd66d4fcecef64cc59076d3f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.2Jani Heikkinen2023-11-171-1/+1
| | | | | Change-Id: I40bb5059042f4919bc729b185d72c97113c0aaab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qdoc: Fix generation of sha1 hash fileJoni Poikelin2023-11-101-1/+4
| | | | | | | | | Pick-to: 6.5 6.2 Fixes: QTBUG-116833 Change-Id: Ic0bddd689fb7564132d2ce17de78d36acf70fc91 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit a5d8339ec745ca2d603b75f00a033b4d8e8ef6bc)
* CMake: Fix the XXX_lupdate targets for Visual Studio generatorsJoerg Bornemann2023-11-101-1/+17
| | | | | | | | | | | | | | | | | | | When using the VS generator, the foo_lupdate targets were run on every build, which is neither expected nor wanted. The reason for this is a pecularity in MSBuild and as a reaction to this, special behavior of CMake: add_dependencies(A B) will enable B in the default build of the solution - even if B is not triggered by the ALL target. See upstream CMake issue #16668 for details. We now work around this problem by building foo_lupdate externally as PRE_BUILD step of update_translations. Pick-to: 6.5 Fixes: QTBUG-115166 Change-Id: I33110450de6289f99954890ff8785ecbe67e5a29 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0338a2f7523e1fe21be325e76f6aba6b0c9e4467) Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-11-101-3/+3
| | | | | Change-Id: I92d41c4d83b7caafaf1d7b5a8993d6b29583b9a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-11-081-3/+3
| | | | | Change-Id: I1b27664deddc35d51499854fa5497c3623d6ff90 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix lupdate leaking a temporary file when hitting on a .pro file errorFriedemann Kleint2023-11-061-4/+22
| | | | | | | | | | | | | The call to exit() in runQtTool() called from createProjectDescription() left the file behind. Factor out helpers that return the exit code and exit() in createProjectDescription(). Fixes: QTBUG-118769 Pick-to: 6.5 Change-Id: I957e71e5860d66ca4c384669923cf5b82abf4ef5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 20ebadd336805769de8ff5be29d24f07ab61efbb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-11-031-3/+3
| | | | | Change-Id: I7748cb91627249d1a87a9fa5fd18871e0fda6323 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-11-021-3/+3
| | | | | Change-Id: Icc9419c19cb46419c0fb18d4204b70eaa8e6ba70 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Centralize handling of the New Form DialogFriedemann Kleint2023-11-024-23/+19
| | | | | | | | | | | | | | | | | There were 2 functions in class QDesignerWorkbench and QDesigner opening the New Form Dialog. Move them to QDesignerWorkbench and give it a bool m_suppressNewFormShow for later use. Handle suppressing the dialog from the command line parsing locally in class QDesigner. Remove the temporary setting of m_suppressNewFormShow from the file open event since it had no influence on QDesignerWorkbench and the Qt 3 conversion dialog mentioned in the comment no longer exists. Task-number: QTBUG-118473 Change-Id: Ia673d98227bf762a4b732b75076da2469ff06d60 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 36c189a9119d5af40ef6f186088e405b0b80bd2e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Use initializer lists in QFormBuilderStringsFriedemann Kleint2023-11-021-16/+14
| | | | | | | | Task-number: QTBUG-118473 Change-Id: I3a3386af04b3fe70ad3cd9d249f36b15947fa15e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 453345999fbb369c67c7a355ee09d7dfdb1b6aa6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Prepare for reading fully qualified enumeration valuesFriedemann Kleint2023-11-023-18/+34
| | | | | | | | | | | Task-number: PYSIDE-2492 Task-number: QTBUG-118240 Task-number: QTBUG-118473 Pick-to: 6.5 Change-Id: I8d9c8ddab555eca49f513069b98bf3871a0e28e6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 9acc2df00b03854fa4bd1234053c89059c2310fe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Use member initialization in the application's classesFriedemann Kleint2023-11-0110-21/+13
| | | | | | | | Task-number: QTBUG-118473 Change-Id: I261ddf780fa005ef7cabf8cec9b1e3404136bb86 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit f2300356dfabfec81739f580d8d177c4af04471f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Convert remaining strings of QFormBuilderStrings into static ↵Friedemann Kleint2023-11-015-73/+60
| | | | | | | | | | | | | | constants Use constexpr QLatin1StringView, which allows for using propertyByName() in more places since a QLatin1StringView fits QAnyStringView. Task-number: QTBUG-118473 Change-Id: Icd1af76934d6528ecf0181d1cabbd1d045b845a2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 47b56e9050b1eaad861427ae9561ae3a06510320) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Strip down class QFormBuilderStringsFriedemann Kleint2023-11-015-97/+42
| | | | | | | | | | Remove strings that are not duplicated, trivial or unused. Task-number: QTBUG-118473 Change-Id: I5fdb15d02e01194775f27f04d7c15ed15a46be6b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 8615f39fb5c15ebace99f7f0e3745d68f27ed6f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QAbstractFormBuilder: Remove some unnecessary DomPropertyHash conversionsFriedemann Kleint2023-11-014-79/+54
| | | | | | | | | | | | | | | | | | | | | | This is the beginning of a series of patches to remove strings from class QFormBuilderStrings. In some QAbstractFormBuilder functions, the property lists are converted to a DomPropertyHash. In some cases, this was done for just one lookup. To avoid these conversions; add a helper to search for a DomProperty by name to QFormBuilderExtra. Add another helper QFormBuilderExtra::getLayoutMargins() for retrieving layout margins from DOM properties. With that in place, some string constants from QFormBuilderStrings can be removed. Task-number: QTBUG-118473 Change-Id: Ieaed9cf14989a85f23b18186abe803fc8396897c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ac4ddedd975a80691c5afaaf54d6721eb7726feb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Remove class WidgetFactory::StringsFriedemann Kleint2023-11-012-85/+26
| | | | | | | | | Task-number: QTBUG-118473 Change-Id: Ib2a5c0e99a1aadb3b3fd473672f2c208d8a6d4b6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b2bcf0399c22dc3e253527a69ae0c5242a61f9fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Highlight some examples for Desktop categoryKai Köhne2023-10-312-0/+6
| | | | | | | | Pick-to: 6.5 Task-number: QTBUG-117208 Change-Id: Ice45caa644f865dca996d0bf90a9e798eeb4bd45 (cherry picked from commit ade769e397456fab374acef6f2e7405fd88112fb) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-301-3/+3
| | | | | Change-Id: Iebce2fb1cd387bf8218e5a6de898ff856541885e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-231-3/+3
| | | | | Change-Id: Icbb4c5e911342464af196ddbd980ecd5d41eb689 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix legacy forms with wrong form object namesFriedemann Kleint2023-10-205-9/+9
| | | | | | | | | | | | Since quite some time, the form object name needs to match the form widget class name. If this is not the case; opening and saving the form will break compilation by generating a lower case class name. Pick-to: 6.5 Change-Id: Ie93cb642fab4109f6af5f0a93a08ce78d51982f4 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit cfbd2fc61e5817d35c98dd0b991b2eacda2a6e1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-201-3/+3
| | | | | Change-Id: I00bf915b4d22d5612b27d5af6f903180d645e664 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDoc: Ensure section command doesn't shadow inherited module statePaul Wicking2023-10-1915-1/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating documentation for a module that is in a state, for example, "Technological Preview", as defined by QDoc's `\modulestate` command, classes that belong to that module are supposed to feature an entry in their requisites table (along with header, CMake/qmake lines, etc). If the documentation for such a class contains a QDoc command that triggers the creation of `DocPrivateExtra`, such as any `\section` command, the entry in the requisites table disappears. This is due to the fact that `Generator::formatExtra()` categorically returns the status that's recorded in the `metaTagMap` of the `DocPrivateExtra`, if one exists, even if it's empty. As such, when e.g. a `\section` command is encountered, an (empty) such `metaTagMap` comes into existence for that documentation block. This patch contains a minimal QDoc project that reproduces the misbehavior, and that serves to confirm that the bugfix contained herein solves the observed issue. The behavior correction ensures that `Generator::formatExtra` checks that the status obtained from `DocPrivateExtra::metaTagMap` isn't empty. If it is, allow processing the other possibilities. Else, return early. Fixes: QTBUG-117778 Change-Id: I47525f69e31d0a924ca9ab380c6c7255040eca6c Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 22ac5ee7e6e9e80c34ffe3616b1ac461e9a552cd) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-181-3/+3
| | | | | Change-Id: Ifc11b1b486d5bdcfa4dcdab9806dffd781696e82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Don't let CMD_VALUE break CMD_TABLEPaul Wicking2023-10-1510-0/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.6' in qt/qttoolsQt Submodule Update Bot2023-10-121-3/+3
| | | | | Change-Id: Ib943c91e547cbdacffcead81e678d13ac3f45c46 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-101-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. Pick-to: 6.5 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>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-091-3/+3
| | | | | Change-Id: I0c09097a96e9770e4c2571abaff584925ebe8534 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-061-3/+3
| | | | | Change-Id: Id9d846e1d81a70c40bed51d93beb9c953515b4ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-031-3/+3
| | | | | Change-Id: I700a4107ac82faf1b3e67e84e83ae33f8a1fb1a5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-10-021-3/+3
| | | | | Change-Id: I892b111fdaa407844988bd0e095ae64329cb5b53 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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. Pick-to: 6.5 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>
* 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. Pick-to: 6.5 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)
* 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 Pick-to: 6.5 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>
* QDoc: Stop encoding `*/` and `\..\.` in HtmlGeneratorPaul Wicking2023-09-3010-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Pick-to: 6.5 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>
* 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 Pick-to: 6.5 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>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-09-281-3/+3
| | | | | Change-Id: Iec8669c7db8ab4557b8899df3aa79ecc46b71020 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-09-261-3/+3
| | | | | Change-Id: Ic49250af347d0c0afec04a32ee1454dff07d0816 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix meta data of the Qt Designer "Multiple Inheritance" exampleFriedemann Kleint2023-09-251-1/+1
| | | | | | | | | | | Amends db7a30bd1dca12b04f04a2617d54e22c61e5cf70 Pick-to: 6.5 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>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-09-251-3/+3
| | | | | Change-Id: I05a1c23b6b5b70ef7bd80e7789ffdd5fe498f1f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-09-221-3/+3
| | | | | Change-Id: I3ff2a2ca44eb7f124760b3a67d798bdc89fbb2e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix zstd::libzstd_shared global target promotion issueAlexandru Croitor2023-09-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | The zstd target might be implicitly created by qt_find_package(WrapLibClang) in configure.cmake via the LLVMConfig.cmake file, because it has a dependency on zstd. Then we try to promote the target to global in the designer src subdirectory, which fails. Check if the target already exists, in which case we skip the global promotion. Similar to 381994598546131f262a3abac7fbcc325acfc7b5 in qtimageformats. Amends a0ecd3b3f7855cba3f8e91aff6617039e641da62 Fixes: QTBUG-117145 Change-Id: I6e946f9fb8130d8e2513f164e99a1ac5dfb9c1ac Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7a710de3fd5d667dbe4fd108a0954abdc6732fa8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 10:50:46 +0000