diff options
author | Axel Spoerl <axel.spoerl@qt.io> | 2022-07-21 21:57:37 +0200 |
---|---|---|
committer | Axel Spoerl <axel.spoerl@qt.io> | 2022-07-22 16:52:35 +0200 |
commit | 2f4204238c7ec6f52b688268b6d3b4b937630074 (patch) | |
tree | 0cb98cbbc47ce95e4676b0ef37f734a4440392fa /src/gui/kernel/qplatformtheme.h | |
parent | e79d7f12e6ca15c499a553e4a701a2887e4b184c (diff) |
Sync and assert StandardPixmap enums in QPlatformTheme and QStyle
Add missing enum values in QPlatformTheme::standardPixmap to sync with
QStyle::standardPixmap changes from:
785d2b9d0728bbbc0d2a92b7d4186a3114d54128
aa5a595a98f1af4a514485268a18e6cb9cfec783
Add enum values NStandardPixmap at the bottom of both enums as well
as an assertion in QStyle constructor that these values are identical.
Add omitvalue for NStandardPixmap in QStyle (QPlatformTheme enum is
not documented).
Pick-to: 6.4
Change-Id: I9ee528d032c445bed5aeace716893b2af8367de2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/kernel/qplatformtheme.h')
-rw-r--r-- | src/gui/kernel/qplatformtheme.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index 50594bfdf0..d64f7633ba 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -230,6 +230,16 @@ public: MediaVolume, MediaVolumeMuted, LineEditClearButton, + DialogYesToAllButton, + DialogNoToAllButton, + DialogSaveAllButton, + DialogAbortButton, + DialogRetryButton, + DialogIgnoreButton, + RestoreDefaultsButton, + TabCloseButton, + NStandardPixmap, // assertion value for sync with QStyle::StandardPixmap + // do not add any values below/greater than this CustomBase = 0xf0000000 }; |