Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support both 5.5 and 5.6 version of ParaView
[modules/gui.git]
/
src
/
SUIT
/
SUIT_Application.cxx
diff --git
a/src/SUIT/SUIT_Application.cxx
b/src/SUIT/SUIT_Application.cxx
index 75d32cfc62397d7cb5ab859886bed5ab0f15e958..06d9180ed8138cd4a388437a8f8014578d1d4de2 100644
(file)
--- a/
src/SUIT/SUIT_Application.cxx
+++ b/
src/SUIT/SUIT_Application.cxx
@@
-693,7
+693,8
@@
int SUIT_Application::registerAction( const int id, QAction* a )
if ( desktop() && desktop()->toolMgr() )
desktop()->toolMgr()->registerAction( a );
if ( desktop() && desktop()->toolMgr() )
desktop()->toolMgr()->registerAction( a );
- if ( desktop() )
+ if ( desktop() && a->shortcutContext() != Qt::WidgetShortcut &&
+ a->shortcutContext() != Qt::WidgetWithChildrenShortcut )
desktop()->addAction( a );
return ident;
desktop()->addAction( a );
return ident;