From 7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 1 Dec 2012 23:30:27 -0600
Subject: Fix a number of build warnings that could lead to unstable operation
 This breaks the ABI

---
 src/styles/qcommonstyle.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/styles/qcommonstyle.cpp')

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;
-- 
cgit v1.2.3