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/styles | |
| 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/styles')
| -rw-r--r-- | src/styles/qcommonstyle.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp index a44ee9f..0ab98b4 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -347,6 +347,11 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid const QButton *button = dynamic_cast<const QButton*>(widget); if (button) { ceData.text = button->text(); + const QPixmap* paletteBgPixmap = 0; + paletteBgPixmap = button->paletteBackgroundPixmap(); + if (paletteBgPixmap) { + ceData.paletteBgPixmap = *paletteBgPixmap; + } } } if (ceData.widgetObjectTypes.contains("QTabBar")) { @@ -3215,6 +3220,13 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleControlElementData &ceData ret = 0; break; + case SH_PopupMenu_SubMenuArrowColorActiveEnabled: + case SH_PopupMenu_SubMenuArrowColorActiveDisabled: + case SH_PopupMenu_SubMenuArrowColorInactiveEnabled: + case SH_PopupMenu_SubMenuArrowColorInactiveDisabled: + ret = -1; + break; + default: ret = 0; break; |