diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/widgets/qaction.cpp | |
| parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/widgets/qaction.cpp')
| -rw-r--r-- | src/widgets/qaction.cpp | 3 |
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() ) |