Revision: 6425
Author: nogu.dev
Date: Sun Jun 6 06:53:38 2010
Log: * Merge r6423 from trunk.
http://code.google.com/p/uim/source/detail?r=6425
Modified:
/branches/1.5/qt4/toolbar/common-uimstateindicator.cpp
=======================================
--- /branches/1.5/qt4/toolbar/common-uimstateindicator.cpp Sun Apr 4
20:39:49 2010
+++ /branches/1.5/qt4/toolbar/common-uimstateindicator.cpp Sun Jun 6
06:53:38 2010
@@ -287,11 +287,13 @@
void QHelperToolbarButton::mousePressEvent( QMouseEvent *event )
{
#ifdef PLASMA_APPLET_UIM
- if ( event->button() == Qt::LeftButton )
- emit menuRequested( menu() );
-#else
- QToolButton::mousePressEvent( event );
+ QMenu *popupMenu = menu();
+ if ( event->button() == Qt::LeftButton && popupMenu ) {
+ emit menuRequested( popupMenu );
+ return;
+ }
#endif
+ QToolButton::mousePressEvent( event );
}
/**/
