summaryrefslogtreecommitdiffstats
path: root/src/widgets/qaction.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-07-28 15:50:52 -0500
committerTimothy Pearson <[email protected]>2012-07-28 15:50:52 -0500
commitebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (patch)
tree2b17bdf68dd5a96e5ef742207426f65010aedac6 /src/widgets/qaction.cpp
parentb129c37241b8777665c2c063713d496e43e934b2 (diff)
downloadqt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.tar.gz
qt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.zip
Fix build warnings
Thanks to Bruce Sass for the patch!
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() )