summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-03 12:38:00 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-03 12:38:00 -0500
commit3a40adfa9157009fec206bfbc36f514bd08b5af8 (patch)
treeb1bbb191d3e82840afd5df1ef381c099ed2a7999
parent5b34ad0d8e489369a0cd8bd1e1b3ccebc4c9acb7 (diff)
downloadqt3-3a40adfa9157009fec206bfbc36f514bd08b5af8.tar.gz
qt3-3a40adfa9157009fec206bfbc36f514bd08b5af8.zip
Fix inability to clear TQPushButton icons once set
This resolves Bug 1857
-rw-r--r--src/styles/qcommonstyle.cpp6
1 files changed, 6 insertions, 0 deletions
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 @@ 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