diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-25 06:55:36 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-25 06:55:36 (GMT) |
| commit | f61f880ee8c3b1ed006dfce8faa55419ae0fa1ce (patch) | |
| tree | c9c92fda62cdf404786e11c85d3d593ca5d4eef7 /src/gui | |
| parent | a1ac8f5f657665a53855f085c6c03e0d5eff5f39 (diff) | |
| parent | 476ab684a7d2c2ede624111bacb59de6905ef123 (diff) | |
| download | Qt-f61f880ee8c3b1ed006dfce8faa55419ae0fa1ce.zip Qt-f61f880ee8c3b1ed006dfce8faa55419ae0fa1ce.tar.gz Qt-f61f880ee8c3b1ed006dfce8faa55419ae0fa1ce.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/statemachine/qguistatemachine.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp index fd14cf9..7fba78e 100644 --- a/src/gui/statemachine/qguistatemachine.cpp +++ b/src/gui/statemachine/qguistatemachine.cpp @@ -154,7 +154,8 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::DeferredDelete: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; - case QEvent::DragEnter: +#ifndef QT_NO_DRAGANDDROP + case QEvent::DragEnter: return new QDragEnterEvent(*static_cast<QDragEnterEvent*>(e)); case QEvent::DragMove: return new QDragMoveEvent(*static_cast<QDragMoveEvent*>(e)); @@ -165,6 +166,7 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::DragResponse: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; +#endif case QEvent::ChildAdded: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; @@ -295,12 +297,12 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::StatusTip: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; - +#ifndef QT_NO_ACTION case QEvent::ActionChanged: case QEvent::ActionAdded: case QEvent::ActionRemoved: return new QActionEvent(*static_cast<QActionEvent*>(e)); - +#endif case QEvent::FileOpen: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; @@ -386,7 +388,7 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::ZeroTimerEvent: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; - +#ifndef QT_NO_GRAPHICSVIEW case QEvent::GraphicsSceneMouseMove: case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: @@ -450,7 +452,7 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::GraphicsSceneWheel: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; - +#endif case QEvent::KeyboardLayoutChange: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; @@ -494,7 +496,7 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::FutureCallOut: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; - +#ifndef QT_NO_GRAPHICSVIEW case QEvent::GraphicsSceneResize: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; @@ -506,7 +508,7 @@ static QEvent *cloneEvent(QEvent *e) me2->setOldPos(me->oldPos()); return me2; } - +#endif case QEvent::CursorChange: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; |