summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-03 12:38:54 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-03 12:38:54 -0500
commit48f56c435242b2e7049aa0a54d9ba7b8d5ef9de5 (patch)
tree987191728510fbe8487370e4991f8ea1861d5e14
parentd9d3dd456aa9e90328255ce9f9ca0bcf77890574 (diff)
downloadtqt3-48f56c435242b2e7049aa0a54d9ba7b8d5ef9de5.tar.gz
tqt3-48f56c435242b2e7049aa0a54d9ba7b8d5ef9de5.zip
Automated update from Qt3
-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 5cb1699df..43e659b39 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -404,6 +404,9 @@ const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWi
if (iconSet) {
ceData.iconSet = *iconSet;
}
+ else {
+ ceData.iconSet = TQIconSet();
+ }
if (fgPixmap) {
ceData.fgPixmap = *fgPixmap;
}
@@ -538,6 +541,9 @@ const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWi
if (iconSet) {
ceData.iconSet = *iconSet;
}
+ else {
+ ceData.iconSet = TQIconSet();
+ }
}
}
// Complex Controls