diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-06 12:45:29 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-06 12:45:29 (GMT) |
| commit | a628b5579a977594cf125110589c8bd5096db380 (patch) | |
| tree | 104988aaef8d19f7a24610eef50ebb9633eaa376 /src/gui/statemachine | |
| parent | 982cffb529f65c7d0c401844ef9af1925e550ffb (diff) | |
| parent | e8b3defc466fff9110ee00b6e730d405cde52abc (diff) | |
| download | Qt-a628b5579a977594cf125110589c8bd5096db380.zip Qt-a628b5579a977594cf125110589c8bd5096db380.tar.gz Qt-a628b5579a977594cf125110589c8bd5096db380.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')
| -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 4f7806f..c3a9228 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: |