aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2/universal/impl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into ↵Tarja Sundqvist2023-03-012-2/+2
|\ | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: Ie5a87ae61d8ed0429225353ad46e5232d60f4daa
| * Universal: don't show hover effects when disabledMitch Curtis2022-08-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 831efa14e91cfa358e57a32197578d41c2ae1b24 made disabled items get hover events, so we need to check if a control is disabled before showing hover effects. Task-number: QTBUG-94919 Change-Id: I36d1696b0cf2ee6a705804d25c1374ab367a6925 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c41a456a50903e69d670a332e93084293a931a5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update commercial license headers"Tarja Sundqvist2022-11-249-197/+197
|/ | | | | | | | | | | This reverts commit 74089697cf2a4961fb697100555b17ae2342d734. Revert of commercial license headers is required for the Qt 6.2.x opensource releases, Qt 6.2.5 onwards. Task-number: QTBUG-107760 Change-Id: Id49069cb5e5f261da185fd082dfb71deb259d387 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Qtqtquickcontrols2universalstyleimplplugin: includemocsMarc Mutz2022-06-063-0/+6
| | | | | | | | | | | | Including moc files directly into their classes' TU tends to improve codegen and enables extended compiler warnings, e.g. about unused private functions or fields. Task-number: QTBUG-102948 Change-Id: I11cc0877cc1980b51a94bc269d77e57e49b5d06d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 18d596e55ecfdbbad67ee7aae7684c7fd2da21ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QtQuick dependency to QtQuick.Controls.Universal.implMarco Bubke2022-06-041-0/+2
| | | | | | | | | | | QQuickPaintedItem is referenced as prototype but there is no dependency declared to QtQuick where it is defined. Change-Id: I6e673cd14cdf3581a08fd5e51148e7debcce408b Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit f3bca9829ceeb1ea6ad3c660f103dfc444d86f7e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update commercial license headersTarja Sundqvist2022-06-049-197/+197
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtdeclarative. Examples, tests, or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4941 Change-Id: I32f554b0a8cb527f74d46f3c02b0e745d9fc5ddf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Use <major>.0 as default version for QML filesUlf Hermann2021-08-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using the full module versions presents problems if you bump the minor version of your module. Bumping the minor version then bumps the versions of all QML files not explicitly versioned. This is certainly not what you want as the files should still be available to imports of the old version. Having it default to minor version 0 is more practical because many QML files are available from version 0 of their respective modules. Now you need to add version entries for files you add after .0 in order for them not to show up in imports of earlier versions. This is less of a problem, though, even if you forget it. In addition, use PAST_MAJOR_VERSIONS to derive additional versions to be added to the QML files. This allows us to drop a lot of boiler plate code from our own modules. Change-Id: I8e4cfc16180af30e8bafc0a62137e9018f7eaee8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit de27215766f13cb5c870e6a1285836164d6e574c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix some qmllint warningsMitch Curtis2021-08-241-2/+2
| | | | | | | | | | Most—if not all—of these are unqualified accesses. Task-number: QTBUG-83755 Change-Id: I5545bc868114f27099c882d41bc799cafb27ded8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 095524dd31aef56d804e89afd74a881e8575ef20) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-091-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. As a drive-by fix, remove Qt::Foo dependencies that are already implied by Qt::FooPrivate. Task-number: QTBUG-90819 Change-Id: I3f33766612367520e09e599f03ac06d43613aa81 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9c30798a439e6a87b574472aca7a4e15107c6221) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update to latest qml CMake APICraig Scott2021-06-0510-0/+1205
The new qml CMake API places a closer relationship between the backing target and the plugin target. Both are typically created together and they share a lot of common details. Instead of creating them in different parts of the source tree, they are now specified together. The src/imports area has effectively been absorbed into the other corresponding subdirectories below src with this change. Task-number: QTBUG-91621 Change-Id: I9bd32e9eb78c198ccc9db04e2829303cac323502 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>