diff options
author | Timothy Pearson <[email protected]> | 2012-12-01 23:30:27 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-12-01 23:30:27 -0600 |
commit | 7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372 (patch) | |
tree | 9eff0506756adca6934846467804a19f291b4509 /src/kernel/qstyle.h | |
parent | bb07131a9191affa4c66f6bc720a388f96343836 (diff) | |
download | qt3-7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372.tar.gz qt3-7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372.zip |
Fix a number of build warnings that could lead to unstable operation
This breaks the ABI
Diffstat (limited to 'src/kernel/qstyle.h')
-rw-r--r-- | src/kernel/qstyle.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h index cf7a235..0efc386 100644 --- a/src/kernel/qstyle.h +++ b/src/kernel/qstyle.h @@ -290,6 +290,7 @@ class Q_EXPORT QStyleControlElementData { QString caption; QStyleControlElementGenericWidgetData topLevelWidgetData; Q_UINT32 topLevelWidgetFlags; + QPixmap paletteBgPixmap; }; class Q_EXPORT QStyleWidgetActionRequestData { @@ -1070,6 +1071,18 @@ public: // bool - whether or not the upper two button drawing areas should be combined into one SH_ScrollBar_CombineSubLineRegionDrawingAreas, + // Qt::QRgb - color of the popup menu arrow (active, menuitem enabled) + SH_PopupMenu_SubMenuArrowColorActiveEnabled, + + // Qt::QRgb - color of the popup menu arrow (active, menuitem disabled) + SH_PopupMenu_SubMenuArrowColorActiveDisabled, + + // Qt::QRgb - color of the popup menu arrow (inactive, menuitem enabled) + SH_PopupMenu_SubMenuArrowColorInactiveEnabled, + + // Qt::QRgb - color of the popup menu arrow (active, menuitem disabled) + SH_PopupMenu_SubMenuArrowColorInactiveDisabled, + // do not add any values below/greater than this SH_CustomBase = 0xf0000000 }; |