Branch: master

3a40adfa 2014-10-03 12:38:00 Timothy Pearson
Fix inability to clear TQPushButton icons once set
This resolves Bug 1857
M src/styles/qcommonstyle.cpp
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 0bad0a5..8d8c4c7 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -404,6 +404,9 @@
 					if (iconSet) {
 						ceData.iconSet = *iconSet;
 					}
+					else {
+						ceData.iconSet = QIconSet();
+					}
 					if (fgPixmap) {
 						ceData.fgPixmap = *fgPixmap;
 					}
@@ -538,6 +541,9 @@
 					if (iconSet) {
 						ceData.iconSet = *iconSet;
 					}
+					else {
+						ceData.iconSet = QIconSet();
+					}
 				}
 			}
 			// Complex Controls