summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-07-131-3/+3
| | | | | Change-Id: Iecc4bfe86c6de7c2db6931cd25cd6f27c569b5c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Store read-only attribute to index for C++ propertiesTopi Reinio2023-07-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The .index files were missing an attribute for C++ properties that are read-only. For a PropertyNode, if setWritable() was not explicitly called, the read-only status was based on whether the property's access functions included a getter method. When reading nodes from an index, these access functions are not restored when constructing a PropertyNode as that information is not needed anymore. A side-effect of this was that all C++ property nodes read from index were considered read-only. QDoc also supports resolving the read-only status for a QML property based on the associated C++ property of a class that the parent QML type instantiates. If this instantiated class was read from index, that meant that the read-only status was resolved incorrectly. To fix, add writable="false" attribute for all read-only C++ properties written to index, and explicitly call setWritable() when reading them back in. Task-number: QTBUG-113015 Fixes: QTBUG-115048 Change-Id: Iaf8276a892d9a764fed9a67ebd005481c16bba17 (cherry picked from commit 3eae45a5d6b87a3d74f2240c5f172dc8be4a2270) Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* linguist: Correct behavior of place marker validationLucie Gérard2023-07-111-1/+2
| | | | | | | | | | | In the case of place markers directly following one another the second was missed Fixes: QTBUG-95340 Change-Id: I567f03905c4d55254ee3945b64eb5392d42c1a2d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ec222b4ca5cf0565d5473e231f0281c64cb803be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate/Python: Handle f/r stringsFriedemann Kleint2023-07-103-9/+68
| | | | | | | | Fixes: PYSIDE-2380 Change-Id: I44ed60039af4df82d4f06bfae9e229847ad1fad6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 5577432ba554e4835ceaa76f6bd97d76f6b7e8aa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Factor out parsing of Python backslash escapingFriedemann Kleint2023-07-071-43/+60
| | | | | | | | | | | Move code to a helper parseStringEscape() and add EOF checking. Task-number: PYSIDE-2380 Change-Id: If9e64ad790355751ec15d6139a0190bb0872685f Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> (cherry picked from commit 08fe8fc69d82d31a41d33cf9685f58eb1071d6a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Improve indentation calculation for Python codeFriedemann Kleint2023-07-073-30/+48
| | | | | | | | | | | | | | Introduce a "def" token for function definitions and perform the calculation of the indentation as well as the pushing/popping of class contexts only for "class" and "def". Fixes: PYSIDE-2379 Change-Id: Ic59af41afbb5ca602c110c3f25dfc953000467d8 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit acb4e247fdf42af633b03e86da4eaf771f66c125) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add explanations on where this example works bestLucie Gérard2023-07-031-0/+4
| | | | | | | | | | This example is not expected to work on Android. Task-number: QTBUG-106380 Change-Id: I09ab5340b0cca0554ef14acb1852befcaae7990d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit a6a2e897092352a3be526cb22410a332573e990c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Sort the output of \generatelist <groupname>Topi Reinio2023-06-3010-16/+27
| | | | | | | | | | | | | | | | | When generating an unordered list of group members with the \generatelist command, the output was not ordered. Use the same method of ordering as \annotatedlist, Node::nodeNameLessThan() as the comparison function. In DocBookGenerator::generateAnnotatedList(), implement sorting as well. This function is used for both annotated and simple (itemized) lists, and sorting brings the DocBook output more in line with HTML generator. Fixes: QTBUG-114956 Change-Id: I5cf967b0ec92b872dcc5e61cc5ed63ec295dd4a1 (cherry picked from commit 25f067613bb5d7c6e35d0812a6dffd72b1b2d5fd) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Fix incorrect meta content generated for \brief containing a linkTopi Reinio2023-06-3021-26/+26
| | | | | | | | | | | | | | | The HTML generator erraneously used output from generateText() directly as the value of a <meta> attribute, for the purpose of adding a \brief statement as the meta content. If the \brief contained a link or formatted text, the output was ill-formed. To fix, call Text::toString() on the retrieved \brief, and ensure it's HTML-compliant with a call to protectEnc(). Fixes: QTBUG-114151 Change-Id: Ib88f0cd31b4f0d88509f084e4ecae81152f91c9b (cherry picked from commit be0438f1699173976a1a36228108baafd52aafec) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* lupdate: Protect id when writing ts filesLucie Gérard2023-06-301-1/+1
| | | | | | | | | | Escapes characters that need be in XML. Fixes: QTBUG-112677 Change-Id: Ie2e57ca30f953a684ea8991537873d60a31a37c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 5859c5b4acb70b8796817e49fa20e121898f9ad2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix remaining clazy/Axivion warnings about ↵Friedemann Kleint2023-06-292-4/+9
| | | | | | | | | | | QMetaObject::connectSlotsByName() Fix oversights from c18520dc4f6ce8f0b8404c772e67ed094a15d086. Change-Id: Ieb465f5e72605d02168ba8cda9422aaf91dc1241 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 7b9d2ea008e06345d8fb1c02cffb7cc607144c29) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Fix missing context in functions with trailing return typeJoerg Bornemann2023-06-293-10/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in the non-clang C++ parser. Out-of-line function definitions with "complex" trailing return type threw lupdate off the rails: the context could not be extracted. For example, the following tr call did not get picked up properly: auto Foo::bar() -> C<int> { tr("x"); return {}; } This happened, because the "prospective context" was cleared when encountering unhandled tokens (the angle brackets). We now try to detect the situation whether -> starts a trailing return type and omit the clearing of the prospective context while in a trailing return type declaration. For clarity, Tok_Other has been renamed to Tok_AngleBracket, because that's what it really represents. The lexer was extended to recognize the 'decltype' keyword. The parser skips all tokes in the parentheses that follow decltype. It's highly unlikely to encounter a tr call there. That allows to handle situations like auto Foo::bar() -> decltype([]() { return 1; }) { tr("x"); return {}; } Fixes: QTBUG-110949 Change-Id: I05a13891195dd76eb89e59d968d5834d40704704 Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 98c098742087f607e732055e538288f8171c0e73) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdbusviewer: Make adding tab for "system bus" optionalRalf Habacker2023-06-271-8/+17
| | | | | | | | | This is useful for platforms that do not have a system bus by default, such as Windows. Task-number: QTBUG-114862 Change-Id: I85c973b74bb782595eb1e40b0f6375c209ba7731 (cherry picked from commit 87fd1c95dead901d6530f32e3aa812ff6e8b0c3d) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qdoc: Set correct genus for TypeAliasNode instancesTopi Reinio2023-06-2317-1/+77
| | | | | | | | | | | | | | | | | | QDoc is meant to treat nodes constructed via \typedef and \typealias commands identically; however, some switch-statements in the code omitted a case for Node::TypeAlias, leading to incorrect behavior. Specifically, marked-up code did nothing for a type alias, and the 'genus' for a TypeAliasNode defaulted to 'DontCare'. This meant that even though normal linking to type alias documentation works, autolinking of the marked-up code in function signatures failed for type aliases as there, QDoc requires the linked node to match the genus of the function (in this case, 'CPP'). Fixes: QTBUG-113863 Change-Id: I9db6727b5e91c30cad14d233eff0319a5dde73c1 (cherry picked from commit 4bad3e8c2dcd2e1a19b5cd6115ae1ad36e0c41e5) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-06-221-3/+3
| | | | | Change-Id: I403792b509972c13e44b4ea41bf8d2b4973320ac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't delete generated .ts files on "ninja clean"Joerg Bornemann2023-06-211-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a translation, the corresponding .ts file doesn't exist yet. Still, we need the .ts file to satisfy the *_lrelease targets we're running on every build. We had a custom command that was generating an initial .ts file in the source directory with lupdate. This had the downside that "ninja clean" would remove this source file - even after the user modified it. On the upside, lupdate was able to guess the language from the file name and wrote the language attribute to the generated .ts file. Having the guessed language written into the initial .ts file matched QMake behavior, but it turns out that it's not actually necessary. If the language attribute is missing, Qt Linguist displays a dialog on opening the file where the source and target languages can be selected. And the guessed language is pre-selected. We now write a minimal initial .ts file on configure time. This file - can be read by lrelease when building the *_lrelease targets - can be updated by lupdate when building the *_lupdate targets - is not deleted on clean Fixes: QTBUG-107853 Change-Id: I5f67a0cf0f02dbf0237a15adf493e9d7aac2485c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 2e1b5267136228d76b5ceb4c5b212a16ddafed58) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix links in \generatelist <groupname> outputTopi Reinio2023-06-158-21/+90
| | | | | | | | | | | | | | | | | | | The \generatelist command already supported listing members of a group as a simple unordered list of titles/links, but the links were broken as they always referred to the current document. In DocBook generator, reuse generateAnnotatedList() for this purpose as it already has support for outputting simple itemized/unordered lists. Create a new private enum GeneratedListType to select the list 'subtype' and clean up the API. Add simple test case and documentation of the new argument. Fixes: QTBUG-111575 Change-Id: I30e4976cef3b6aa5414aac457844ae5bc0762f3d Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 2ba87cd00e6527dbd64f5884f29081bd535605bb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.5.3Jani Heikkinen2023-06-151-1/+1
| | | | | Change-Id: Ib7002cc7d12a40a08bd1668a8df95eb4d5126900 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-06-151-3/+3
| | | | | Change-Id: I6eb083f88c651eb0efd5d20d7d43efc3ebd92ec6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-06-131-3/+3
| | | | | Change-Id: I5160ce09fddeb65a855cb497c374b553ac11f47f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-06-121-3/+3
| | | | | Change-Id: I06dc3e2377a8e2cf600fadef270c7d23e3d86238 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Fix clazy/Axivion warnings about QMetaObject::connectSlotsByName()Friedemann Kleint2023-06-1216-138/+193
| | | | | | | | | | | | | | Migrate to Qt 5 connection syntax. Also rename the slots for which explicit connections were already added by qttools/f23befda718870f3dbb8f6e005e12a251fdfd059 for the TableWidgetEditor/TreeWidgetEditor classes so that they are no longer found. Change-Id: I9b6316c65f714e2a2117196e92d7517641648d95 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit c18520dc4f6ce8f0b8404c772e67ed094a15d086) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-06-091-3/+3
| | | | | Change-Id: Ic8ade4c981eb4e331655ba73f4f26818604ef238 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace Q_OS_OSX with Q_OS_MACOSTor Arne Vestbø2023-06-074-5/+5
| | | | | | | Change-Id: Idfe9f578372844e8eec22414a8e2c5d5383f2b98 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ec58540cd5ea931d66b25a95704d832d1a85a9c8) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Remove conanfile.pyTor Arne Vestbø2023-06-071-57/+0
| | | | | | | | | | The conan experiment has ended, and the file is only bitrotting nowadays. Change-Id: Ia5949a62bb15f901c2170d6d5b69e8ebe75e8456 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 22326ad7912ba77b8819f80f953b0829c6b112e1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-06-071-3/+3
| | | | | Change-Id: I24fd88eeb85cf487c910107615bc6c94731fb0dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Qt Designer: Replace a QHash<QObject *,bool> by QSet<QObject *>"Friedemann Kleint2023-06-062-3/+3
| | | | | | | | | | | This reverts commit c3feee64550c42aacd4b39bc180c34b63f010fc2. It causes a BIC break since the destructor is inline. Change-Id: Id51ad5c16b3ff9267df186cafd6c4bdba9031904 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 6e450cc0a6763a1dae632b893a59a0841d09e82e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-06-061-3/+3
| | | | | Change-Id: Ieb59875c0fb6ac8ac12da1dc4f803979b96faccf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Fix clazy/Axivion warning about mixing const/iteratorsFriedemann Kleint2023-06-051-2/+2
| | | | | | | | | QMap::insert() returns iterator. Change-Id: I43938fe2b5ea4fb1e000fa20d088c5e566cd9b64 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 451df2584f1f817feffa3c4d46b0eef6ba09f0ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix clazy/Axivion warning about base class method invocationFriedemann Kleint2023-06-051-1/+1
| | | | | | | | | | QWidget::minimumSizeHint() / QDialog::minimumSizeHint() return (-1, -1), so it, looks like an oversight. Change-Id: I552d76a4c592a37600521edd7e4b0694acf2d4da Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 56b7f879d9225a47eacc9da8fe016b2961dc48dc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Property browser: Fix clazy/Axivion warnings about QMap with ↵Friedemann Kleint2023-06-052-98/+99
| | | | | | | | | const pointer keys Change-Id: I5a7e6176bfa269bc1cd47683595069945afe309f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 0f5bb1d955ab5215d04c48d76d36093feb5ff42b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Examples: Remove unnecessary Q_INIT_RESOURCE callsKai Köhne2023-06-053-6/+0
| | | | | | | | | | | | Explicit calls to Q_INIT_RESOURCE are only needed for resources embedded in static libraries. See also https://doc.qt.io/qt-6/resources.html#explicit-loading-and-unloading-of-embedded-resources Change-Id: I68c383be82478db7967136ccefdc3e4ee688e96f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 5a07ba988eaa4ad7ba5614a9ddb50d7270fe68e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: QDoc manual: Remove incorrect statement for \typealias commandTopi Reinio2023-06-011-7/+0
| | | | | | | | | | | The \typealias command does not generate documentation automatically, it behaves similarly to the \typedef command. Fixes: QTBUG-113864 Change-Id: I1e5d3b32bf29cd07909b271ffd2102fbcede5818 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 539933b8f8e9b315239a4cb063866f669b1e7532) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Clean up Designer's extension plugins examples' qmake filesJoerg Bornemann2023-05-313-30/+0
| | | | | | | | | | The QTDIR_build scopes are not used anymore. Change-Id: Ic722645641419b3beb22ac36a02a862f6e7b179e Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit f64ab44deb8b611911ede70911a57d37f773a3a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Shared solutions: Fix clazy/Axivion warnings about QMap with ↵Friedemann Kleint2023-05-314-33/+37
| | | | | | | | | pointer keys Change-Id: Id7b644912daac479989b5928f8157a2a874776f1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit fd6e577676afb10bc24768db76f6d6449a5ee828) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Shared solutions: Migrate typedef->usingFriedemann Kleint2023-05-313-13/+8
| | | | | | | Change-Id: Ic0e643d3080ab9679dc172bc70573dc3c8162795 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 02491c2a325223ebbc16274742395ae83a0c1fe1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-311-3/+3
| | | | | Change-Id: I3bb70e056784229765224a38dec272ebb5d368da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Fix clazy/Axivion warnings about QMap with pointer keysFriedemann Kleint2023-05-307-86/+89
| | | | | | | | Change-Id: Ia9a955893870ff1e83bba597932a65569ebfa450 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 7086f38d74262b6b303cdae22ede5921ba6c2f48) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Migrate typedef->usingFriedemann Kleint2023-05-3023-46/+30
| | | | | | | Change-Id: I832deaab6fc64d732051707358870d0c2deffcd8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit bf0e106f00a590c9b5030b940da2603b2cffe214) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Property browser: Fix clazy/Axivion warnings about QMap with ↵Friedemann Kleint2023-05-306-40/+40
| | | | | | | | | pointer keys Change-Id: I991d1dd70f48c84e45f3779371f5ee49faf2ff0a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 63ad31821b466d3140d4bfcbc38d8db00adeac16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Use auto for iteratorsFriedemann Kleint2023-05-3063-345/+228
| | | | | | | | | | Remove some typedefs. Change-Id: Ib7c45fcb35491215a2798a53051ea044f1ae3707 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit bc40da956425f2025d6066ab52d5fd62233ba40a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Resource editor: Fix dubious use of iteratorsFriedemann Kleint2023-05-301-12/+5
| | | | | | | | | | Re-inserting existing entries should be equivalent to setting the value to true. Change-Id: I224030b08369feb2f198f766240793ca1a977af2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit c816efd27782310510d35a2fb8c31eb22a7cd332) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-291-3/+3
| | | | | Change-Id: I63a604625e369390b31a075ba382f4310acd8294 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix qt6_create_translation for same-named .ts filesJoerg Bornemann2023-05-266-7/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider a project where .ts files are structured by directory instead of by file name: translations/chinese/myapp.ts translations/czech/myapp.ts translations/french/myapp.ts translations/german/myapp.ts translations/italian/myapp.ts In that case, qt6_create_translation failed at configure time with the following error: Attempt to add a custom rule to output /build/myapp/.lupdate/myapp.ts.stamp.rule which already has a custom rule. Fix that by constructing a .ts.stamp file path that takes the relative path from CMAKE_CURRENT_SOURCE_DIR to the .ts file into account. Additionally, pass the paths of the timestamp files to qt6_add_translation with the __QT_INTERNAL_TIMESTAMP_FILES multi-value argument to avoid having to recalculate the paths of the timestamp files. Fixes: QTBUG-113152 Change-Id: Ifa08741cd621f2215eaf2f8fb848ecf6d5b9cf13 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit d2eaccfe7f613faa2083277d2d43c10c85053126) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-251-3/+3
| | | | | Change-Id: I49da4bb4d9fe0936d12ff338c9750b1bd3f65c37 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Replace a QHash<QObject *,bool> by QSet<QObject *>Friedemann Kleint2023-05-252-3/+3
| | | | | | | Change-Id: I6f18597d7777a4cacac1e6cb5d2c2059a00e868f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit c3feee64550c42aacd4b39bc180c34b63f010fc2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix some clazy/Axivion warnings about QMap with pointer keysFriedemann Kleint2023-05-2514-40/+32
| | | | | | | | | | Use QHash instead. As drive-by, replace a QMap<int,bool> used as QSet. Change-Id: I3fc3c6074b356a5d75baf7f1e4e442f80aedf1c7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit d18d046847a2be3b557df1d7964fedccf2a1ea7b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Property browser: Fix some repetitive type namesFriedemann Kleint2023-05-248-159/+157
| | | | | | | | | | Use auto or return {}. Task-number: QTBUG-113670 Change-Id: Ia04ad73aaef36d7bcf3faa53593b7748cdf20d46 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ed892aa1a00308fbec11c0bb12b643a54160f90e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Property browser: Fix some nullptr occurrencesFriedemann Kleint2023-05-246-148/+148
| | | | | | | | Task-number: QTBUG-113670 Change-Id: I6f2441f4c53c20738fbebb9a9c1eb8db91515aef Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 41b2f569fc315428301a79b36f9da8a71feccc9d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Property browser: Replace typedef by "using"Friedemann Kleint2023-05-244-11/+13
| | | | | | | | Task-number: QTBUG-113670 Change-Id: I32d88fff887778eb804dd0d38ae8c95b2d76ec6d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 0aacf33db47989067c8e7ec55925cd3a78a823f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 19:51:31 +0000