aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2/qtquickcontrols2plugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update commercial license headers"Tarja Sundqvist2022-11-241-22/+22
| | | | | | | | | | | 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>
* Add file selector for custom styles when using run-time style selectionMitch Curtis2022-06-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | Previously this was only available for QQuickStylePlugin-based styles. This patch makes it available for qmldir-based styles when using run-time style selection. The existing documentation doesn't differentiate between built-in styles and custom styles: "Qt Quick Controls extends the built-in selectors with the name (lowercase) of the style that an application is running with." So this is a bug fix. Change-Id: Ib2ed56ad8398db49d192db6a6023d776caaa4457 Fixes: QTBUG-99117 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit fdd62a5b81d5c3de423118bb24d5ac18a7fddbe5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update commercial license headersTarja Sundqvist2022-06-041-22/+22
| | | | | | | | | | | | | | | 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>
* Avoid GHS linker to optimize away QML type registrationsTatiana Borisova2021-08-091-0/+2
| | | | | | | | | | | | GHS linker optimizes away QML type registrations despite volatile. To prevent this we add #pragma ghs reference(s) to avoid such linker optimization. Task-number: QTBUG-94846 Change-Id: I8614b904657d706e93541d84cbe43f4826abbd60 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit abbcbf22079a9135e9bd19ac4e0e3c71e2f5f792) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update to latest qml CMake APICraig Scott2021-06-051-0/+167
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>