From 6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 1 Dec 2012 23:30:53 -0600
Subject: Automated update from Qt3

---
 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 41ed19d0b..ad8669827 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -347,6 +347,11 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 				const TQButton *button = dynamic_cast<const TQButton*>(widget);
 				if (button) {
 					ceData.text = button->text();
+					const TQPixmap* paletteBgPixmap = 0;
+					paletteBgPixmap = button->paletteBackgroundPixmap();
+					if (paletteBgPixmap) {
+						ceData.paletteBgPixmap = *paletteBgPixmap;
+					}
 				}
 			}
 			if (ceData.widgetObjectTypes.contains("TQTabBar")) {
@@ -3215,6 +3220,13 @@ int TQCommonStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDa
 	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.1