aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols/qtquickcontrols2plugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Set explicit default security level of all files with default securityJan Arve Sæther2025-09-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The files (folders) already processed are listed in each issue in epic QTBUG-134547 These files were processed half a year ago. In order to make it clear that all of these files are already processed, mark them with an explicit default security header. For the record, this was generated with this script: find -E . -regex ".*\.(cpp|h|hpp|mm|qml|js)$" | xargs python3 ~/bin/add-cra-header.py in the folders listed in each subtask of QTBUG-134547 (add-cra-header.py only exist at my desktop, but it simply adds the default security header if it doesn't already have any existing security header) QUIP: 23 Fixes: QTBUG-134547 Pick-to: 6.10 6.9 6.8 Change-Id: Ieb8c78ea6561fdbdd27c7b13185ece853eedf80f Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
* Controls: Fix module imports of fallback stylesUlf Hermann2023-01-201-19/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you specify an explicit fallback, it should take precedence over any implicit fallback the style might specify. If you don't, the implicit fallback should take precedence. If, however, the main style is a custom one, we cannot indirectly import QtQuick.Controls.Basic through it as the versions may not match. For that case, add a QtQuick.Controls.IndirectBasic module that does nothing but import QtQuick.Controls.Basic. Also, add a test that checks whether the expected fallback was imported and fix some mistaken test data along the way. In Qt 6.4 and earlier you could not override the implicit fallback since the precedence between imports was wrong. After that was fixed in commit a0290dcc53a14b67c0179c43ce8dc21b43cfc83b the fallback style set from QtQuick.Controls ("Basic" if not requested explicitly) would always override the implicit fallback style. Both behaviors are equally wrong. We need to actually check whether the fallback is explicitly set or not. Pick-to: 6.5 Fixes: QTBUG-110247 Change-Id: I1aeee05c1c720bebf8b1b55361fd035a5565fb1b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove "2" from Qt Quick Controls directoriesMitch Curtis2022-12-011-0/+140
Qt Quick Controls 2 was named that way because it was a follow-up to Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer supported, we don't need to have "2" in the name. Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. By doing this renaming a few weeks before feature freeze, it won't affect the release but still results in as little time possible spent manually fixing conflicts in cherry-picks from non-LTS releases as a result of the renaming. This patch does the following: - Renames directories. - Adapts CMakeLists.txt and other files to account for the new paths. A follow-up patch will handle documentation. It does not touch library names or other user-facing stuff, as that will have to be done in Qt 7. Task-number: QTBUG-95413 Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>