summaryrefslogtreecommitdiffstats
path: root/src/widgets/qaction.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:50:52 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-08-04 14:53:35 +0200
commit5ae82a06c308960c66757b0a956500b05b83f002 (patch)
treee73bef929c230d306f377880042ce09894812ccd /src/widgets/qaction.cpp
parente9fed234b762ffe73037d70bf29ce90ea7ab8d37 (diff)
downloadqt3-3.5.13.1.tar.gz
qt3-3.5.13.1.zip
Fix build warningsv3.5.13.1
Thanks to Bruce Sass for the patch! (cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484)
Diffstat (limited to 'src/widgets/qaction.cpp')
-rw-r--r--src/widgets/qaction.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 1e68de0..3dd6b27 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -287,11 +287,12 @@ void QActionPrivate::update( uint upd )
if ( upd & Visibility )
mi->popup->setItemVisible( mi->id, visible );
- if ( upd & Icons )
+ if ( upd & Icons ) {
if ( iconset )
mi->popup->changeItem( mi->id, *iconset, t );
else
mi->popup->changeItem( mi->id, QIconSet(), t );
+ }
if ( upd & EverythingElse ) {
mi->popup->changeItem( mi->id, t );
if ( !whatsthis.isEmpty() )