diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2026-02-26 08:35:11 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2026-02-26 09:35:55 +0000 |
| commit | 2d420af19d9f6629282abf5d61b1e931a8debd6f (patch) | |
| tree | 87cc03ab8fb0ea7f776aa47976e24f52d5b7fb9d | |
| parent | 72736d1f07fefcf1a038c35e466824c14f5012af (diff) | |
Controls: fix even more 6.11 QML API review findingsv6.11.0-rc1
This time confirmed with:
grep -Ri ".*Action.qml" ~/dev/qt-dev-debug/qtbase/qml/QtQuick
This check doesn't cover the styles that aren't built on my system,
but they are macOS, iOS, Windows, which are accounted for in this
change.
Amends f568dedf206785c20afcfa1b15252f9f888bdd48.
Pick-to: dev 6.11
Change-Id: I48aa03f7123c2f6f8ee91ed89ced2b521ba9d978
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/quickcontrols/fluentwinui3/impl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quickcontrols/fusion/impl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quickcontrols/ios/impl/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/quickcontrols/macos/impl/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/quickcontrols/universal/impl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quickcontrols/windows/impl/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/quickcontrolsimpl/CMakeLists.txt | 2 |
7 files changed, 45 insertions, 0 deletions
diff --git a/src/quickcontrols/fluentwinui3/impl/CMakeLists.txt b/src/quickcontrols/fluentwinui3/impl/CMakeLists.txt index 7f51b8dd80..e8ce5a03af 100644 --- a/src/quickcontrols/fluentwinui3/impl/CMakeLists.txt +++ b/src/quickcontrols/fluentwinui3/impl/CMakeLists.txt @@ -26,8 +26,10 @@ set_source_files_properties( CutAction.qml DeleteAction.qml PasteAction.qml + RedoAction.qml SelectAllAction.qml TextEditingContextMenu.qml + UndoAction.qml PROPERTIES QT_QML_SOURCE_VERSIONS "6.11" ) diff --git a/src/quickcontrols/fusion/impl/CMakeLists.txt b/src/quickcontrols/fusion/impl/CMakeLists.txt index 6d929badb7..587a294290 100644 --- a/src/quickcontrols/fusion/impl/CMakeLists.txt +++ b/src/quickcontrols/fusion/impl/CMakeLists.txt @@ -28,8 +28,10 @@ set_source_files_properties( CutAction.qml DeleteAction.qml PasteAction.qml + RedoAction.qml SelectAllAction.qml TextEditingContextMenu.qml + UndoAction.qml PROPERTIES QT_QML_SOURCE_VERSIONS "6.11" ) diff --git a/src/quickcontrols/ios/impl/CMakeLists.txt b/src/quickcontrols/ios/impl/CMakeLists.txt index b28e5f3970..cbe55f7083 100644 --- a/src/quickcontrols/ios/impl/CMakeLists.txt +++ b/src/quickcontrols/ios/impl/CMakeLists.txt @@ -16,6 +16,17 @@ set(qml_files "TextEditingContextMenu.qml" ) +set_source_files_properties( + CopyAction.qml + CutAction.qml + DeleteAction.qml + PasteAction.qml + SelectAllAction.qml + TextEditingContextMenu.qml + PROPERTIES + QT_QML_SOURCE_VERSIONS "6.11" +) + qt_internal_add_qml_module(QuickControls2IOSStyleImpl URI "QtQuick.Controls.iOS.impl" VERSION "${PROJECT_VERSION}" diff --git a/src/quickcontrols/macos/impl/CMakeLists.txt b/src/quickcontrols/macos/impl/CMakeLists.txt index 572d493576..77cce152a7 100644 --- a/src/quickcontrols/macos/impl/CMakeLists.txt +++ b/src/quickcontrols/macos/impl/CMakeLists.txt @@ -16,6 +16,19 @@ set(qml_files "UndoAction.qml" ) +set_source_files_properties( + CopyAction.qml + CutAction.qml + DeleteAction.qml + PasteAction.qml + RedoAction.qml + SelectAllAction.qml + TextEditingContextMenu.qml + UndoAction.qml + PROPERTIES + QT_QML_SOURCE_VERSIONS "6.11" +) + qt_internal_add_qml_module(QuickControls2MacOSStyleImpl URI "QtQuick.Controls.macOS.impl" VERSION "${PROJECT_VERSION}" diff --git a/src/quickcontrols/universal/impl/CMakeLists.txt b/src/quickcontrols/universal/impl/CMakeLists.txt index 77711f6d3d..a954064e25 100644 --- a/src/quickcontrols/universal/impl/CMakeLists.txt +++ b/src/quickcontrols/universal/impl/CMakeLists.txt @@ -24,8 +24,10 @@ set_source_files_properties( CutAction.qml DeleteAction.qml PasteAction.qml + RedoAction.qml SelectAllAction.qml TextEditingContextMenu.qml + UndoAction.qml PROPERTIES QT_QML_SOURCE_VERSIONS "6.11" ) diff --git a/src/quickcontrols/windows/impl/CMakeLists.txt b/src/quickcontrols/windows/impl/CMakeLists.txt index d5c0b1226f..c9fc326669 100644 --- a/src/quickcontrols/windows/impl/CMakeLists.txt +++ b/src/quickcontrols/windows/impl/CMakeLists.txt @@ -14,6 +14,19 @@ set(qml_files "UndoAction.qml" ) +set_source_files_properties( + CopyAction.qml + CutAction.qml + DeleteAction.qml + PasteAction.qml + RedoAction.qml + SelectAllAction.qml + TextEditingContextMenu.qml + UndoAction.qml + PROPERTIES + QT_QML_SOURCE_VERSIONS "6.11" +) + qt_internal_add_qml_module(QuickControls2WindowsStyleImpl URI "QtQuick.Controls.Windows.impl" VERSION "${PROJECT_VERSION}" diff --git a/src/quickcontrolsimpl/CMakeLists.txt b/src/quickcontrolsimpl/CMakeLists.txt index 61792f657d..8e1bcc8f76 100644 --- a/src/quickcontrolsimpl/CMakeLists.txt +++ b/src/quickcontrolsimpl/CMakeLists.txt @@ -10,7 +10,9 @@ set_source_files_properties( CutAction.qml DeleteAction.qml PasteAction.qml + RedoAction.qml SelectAllAction.qml + UndoAction.qml PROPERTIES QT_QML_SOURCE_VERSIONS "6.11" ) |
