diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-06 15:39:53 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-06 15:39:53 (GMT) |
| commit | 53c36eb868a800569557e01ba075964127e9cffd (patch) | |
| tree | 0847756bbed8c30268940334d1bf57d9fa509348 /src/gui/kernel/qgesturemanager.cpp | |
| parent | daf5f511ee813fc4fffba64bed558d0413270388 (diff) | |
| parent | 6d7d54813f4cfc326fc52d3402653b924677124a (diff) | |
| download | Qt-53c36eb868a800569557e01ba075964127e9cffd.zip Qt-53c36eb868a800569557e01ba075964127e9cffd.tar.gz Qt-53c36eb868a800569557e01ba075964127e9cffd.tar.bz2 | |
Merge branch 'feature' into 4.6
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index 375116f..abd2128 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -179,8 +179,10 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni return 0; } else if (QGesture *g = qobject_cast<QGesture *>(object)) { return g; +#ifndef QT_NO_GRAPHICSVIEW } else { Q_ASSERT(qobject_cast<QGraphicsObject *>(object)); +#endif } QList<QGesture *> states = |