diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-06 14:22:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-06 14:22:21 (GMT) |
| commit | a24d87f6469fa491624590383617b43c2b3dda32 (patch) | |
| tree | ee6a76cecf35e3f20951f5b13785aaaef12bbade /src/gui/statemachine/qguistatemachine.cpp | |
| parent | da19e7f6b6b822f7a473c4eb2dff001a3434353a (diff) | |
| parent | 2f8e66b326c3d6748d530ab5abbf4fe5a91a6a3f (diff) | |
| download | Qt-a24d87f6469fa491624590383617b43c2b3dda32.zip Qt-a24d87f6469fa491624590383617b43c2b3dda32.tar.gz Qt-a24d87f6469fa491624590383617b43c2b3dda32.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/statemachine/qguistatemachine.cpp')
| -rw-r--r-- | src/gui/statemachine/qguistatemachine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp index 01a158b..70f152d 100644 --- a/src/gui/statemachine/qguistatemachine.cpp +++ b/src/gui/statemachine/qguistatemachine.cpp @@ -186,8 +186,10 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::DeactivateControl: return new QEvent(*e); +#ifndef QT_NO_CONTEXTMENU case QEvent::ContextMenu: return new QContextMenuEvent(*static_cast<QContextMenuEvent*>(e)); +#endif case QEvent::InputMethod: return new QInputMethodEvent(*static_cast<QInputMethodEvent*>(e)); case QEvent::AccessibilityPrepare: |