Fix inability to clear TQPushButton icons once set

This resolves Bug 1857
10 years ago · 3a40adfa91
parent 5b34ad0d8e
commit 3a40adfa91
1 changed files with 6 additions and 0 deletions
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@ -404,6 +404,9 @@ const QStyleControlElementData &populateControlElementDataFromWidget(const QWidg
 					if (iconSet) {
 						ceData.iconSet = *iconSet;
 					}
+					else {
+						ceData.iconSet = QIconSet();
+					}
 					if (fgPixmap) {
 						ceData.fgPixmap = *fgPixmap;
 					}
@ -538,6 +541,9 @@ const QStyleControlElementData &populateControlElementDataFromWidget(const QWidg
 					if (iconSet) {
 						ceData.iconSet = *iconSet;
 					}
+					else {
+						ceData.iconSet = QIconSet();
+					}
 				}
 			}
 			// Complex Controls