diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-04-15 09:19:56 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-04-15 09:19:56 (GMT) |
| commit | 21099dac569348a15df2d6a5a61015b5afa17097 (patch) | |
| tree | b4ae338f206666b7f07e1f78278ad6d38609880b /src/gui/widgets/qabstractbutton.cpp | |
| parent | f169ca1020886707b04101300e365d79f38a6332 (diff) | |
| parent | 4e78de5a4281bd1c27a984b13887975798573aae (diff) | |
| download | Qt-21099dac569348a15df2d6a5a61015b5afa17097.zip Qt-21099dac569348a15df2d6a5a61015b5afa17097.tar.gz Qt-21099dac569348a15df2d6a5a61015b5afa17097.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/gui/widgets/qabstractbutton.cpp')
| -rw-r--r-- | src/gui/widgets/qabstractbutton.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp index c25253a..f2a9ceb 100644 --- a/src/gui/widgets/qabstractbutton.cpp +++ b/src/gui/widgets/qabstractbutton.cpp @@ -1250,15 +1250,6 @@ void QAbstractButton::timerEvent(QTimerEvent *e) } } -#if defined(Q_OS_WINCE) && !defined(QT_NO_CONTEXTMENU) -/*! \reimp */ -void QAbstractButton::contextMenuEvent(QContextMenuEvent *e) -{ - e->ignore(); - setDown(false); -} -#endif - /*! \reimp */ void QAbstractButton::focusInEvent(QFocusEvent *e) { |