diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-02-07 10:52:42 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-02-15 14:04:44 +0100 |
| commit | 82cda71298e3eea40f7379b412b0a36fe401b48a (patch) | |
| tree | 4125e70f6c0e6129f2ceb922ca284dd80833c18d /tests/auto/qml/qmlcppcodegen/data | |
| parent | 75a41f0773b840419369c9395610caca7748b9eb (diff) | |
Controls: Use PlatformDialogHelper for enums in DialogButtonBox
Since we're already using 3 of the 4 enums in PlatformDialogHelper, we
can just as well declare PlatformDialogHelper as extended namespace and
avoid all the fiddling with Q_ENUMS and QFLAGS.
As an additional upside, we get code using those enums to compile to
C++ this way.
Pick-to: 6.5
Fixes: QTBUG-110933
Change-Id: I60bfc15c94133be368fa98ee1b3a0ab7a2bc53ef
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlcppcodegen/data')
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/dialogButtonBox.qml | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt index 0737d77005..f80dac60fb 100644 --- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt @@ -83,6 +83,7 @@ set(qml_files deadShoeSize.qml deadStoreLoop.qml dialog.qml + dialogButtonBox.qml dynamicscene.qml enumConversion.qml enumInvalid.qml diff --git a/tests/auto/qml/qmlcppcodegen/data/dialogButtonBox.qml b/tests/auto/qml/qmlcppcodegen/data/dialogButtonBox.qml new file mode 100644 index 0000000000..b30e0124c8 --- /dev/null +++ b/tests/auto/qml/qmlcppcodegen/data/dialogButtonBox.qml @@ -0,0 +1,8 @@ +pragma Strict +import QtQuick.Controls.Basic + +ApplicationWindow { + footer: DialogButtonBox { + standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel + } +} |