summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.2' in qt/qttoolsv6.5.26.5.2Qt Submodule Update Bot2023-07-071-3/+3
| | | | | Change-Id: I7cf1f90d15d0ecc268cf1cc3cd3430e4df580b8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qttoolsQt Submodule Update Bot2023-06-301-3/+3
| | | | | Change-Id: If0bf37a9b187c08116b3dbbfa093b9e5c731dd51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qttoolsQt Submodule Update Bot2023-06-211-3/+3
| | | | | Change-Id: I7e2f8cab4cdd1b5e40742af7023d627025cca4d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qttoolsQt Submodule Update Bot2023-06-201-3/+3
| | | | | Change-Id: Icd5b93afa68cf31adbb276d8c917544a35629193 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qttoolsQt Submodule Update Bot2023-06-151-3/+3
| | | | | Change-Id: I6f8746baad7a23b4b37f9ac438bc20e383c27b5a 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>
* Qt Designer/Property browser: Introduce auto for iteratorsFriedemann Kleint2023-05-244-111/+86
| | | | | | | | | | | This allows for removing the PropertyValueMap typedefs since they are used only once. Task-number: QTBUG-113670 Change-Id: If0b3d8dd7e722537c1594874a42d247aa5e7167a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 03ce011f43d82968725333db397b6ae1241076fe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix some clazy/Axivion warnings about Rule Of Three/FiveFriedemann Kleint2023-05-248-10/+17
| | | | | | | | | | | | - Add missing destructors or copy/move constructors via Qt convenience macros - Remove deleted copy/move constructors for classes declared Q_OBJECT - Add Q_DISABLE_COPY_MOVE to RAI-like classes Change-Id: I2f1d330ad28a89a35fb306fd9813fbb60a710756 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 7f7ce6b17b24a3cc244cb0c6d5fe2afed278787d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Property Browser Fix some clazy/Axivion warnings about mixing ↵Friedemann Kleint2023-05-241-12/+8
| | | | | | | | | | | iterators with const iterators Use constFind() and some auto. Change-Id: I0801ae1eabd09dd581abfa5c6766c5905bb31c35 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ac615610bcbb5d72163d5e66f80e7d0978e18356) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-241-3/+3
| | | | | Change-Id: I9510d2a661aba4af51b2505183cc9037ba2d0d2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Rewrite the script to regenerate the ui4.cpp/.h in PythonFriedemann Kleint2023-05-231-120/+91
| | | | | | | | | | Task-number: QTBUG-113670 Change-Id: Iacc15c9015e585bd0565cc13afb23a23e3a7d096 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 0734540f43131dc3d742ff03fff5a4428b030834) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Add QFont::HintingPreference to property editorFriedemann Kleint2023-05-233-10/+125
| | | | | | | | | | | [ChangeLog][Qt Designer] Support for the QFont::HintingPreference property has been added. Task-number: QTBUG-113670 Change-Id: I48fd028c1a58e2cb47512accbb1a97c20cc213b0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 85f0b6ff40a92a59c907dbadaa53391f5eb53539) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Read and write QFont::HintingPreferenceFriedemann Kleint2023-05-232-0/+11
| | | | | | | | Task-number: QTBUG-113670 Change-Id: I60c6e26340be0042d76a027626d148ce51e28a2a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 0162bc5d0c74656ab34d1f3039cc9b61585ed105) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Add QFont::HintingPreference to .ui schemaFriedemann Kleint2023-05-234-1/+28
| | | | | | | | Task-number: QTBUG-113670 Change-Id: Ib71ecbf72bc73dab2383e82fc1ca5259c13ca2b0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit a2d1de9f9828fe791e71af53a250514055b91c4e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-231-3/+3
| | | | | Change-Id: I165da8cf2e97e8c46864545b0823c03d5db21b01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Fix the generate_ui script to work with SPDX licensesFriedemann Kleint2023-05-221-2/+1
| | | | | | | | | | | Remove left over qtxmlpatterns variable. Task-number: QTBUG-67283 Task-number: QTBUG-113670 Change-Id: I440d73fb48a657e9b162ca7aadb233bd83076667 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 5d07207991e6f37c2a053591bc18a4e3ca11f155) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-221-3/+3
| | | | | Change-Id: Id00c0d5d27bde4c0b7fc7f6aa21b42d82f4f3a10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-191-3/+3
| | | | | Change-Id: Iae0fd2f436956b2db475235d6185268701efd9ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Wrap a <div> around the addendum noteVenugopal Shivashankar2023-05-164-21/+24
| | | | | | | | | | | The addendum added to the C++ and QML methods, properties, and signals, lack the necessary styling. They are added as a simple HTML para, without the appropriate admonition CSS class, which is normally used for a \note. Change-Id: I10cb9d51c587fb21024168a57e8661f7da0ad323 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 941a9b5e5963f8c0798415e3cb69f031da1f4109)
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-05-161-3/+3
| | | | | Change-Id: I0c79b738a75baa27dbf75cee44b10de56317fd63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:01:43 +0000