diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-11 17:19:29 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-11 17:19:29 (GMT) |
| commit | 8c13e18eb49ab9ab42db4359f0ccc91de5c72818 (patch) | |
| tree | 17dbc029e37835594ad29d586f3fc7ec8013b65a /src/gui/kernel/qgesturemanager.cpp | |
| parent | de76200652e05de34d99f111c64a051a49911034 (diff) | |
| parent | 2d63f8fe5b77747014e1c5807c9d457611bd9304 (diff) | |
| download | Qt-8c13e18eb49ab9ab42db4359f0ccc91de5c72818.zip Qt-8c13e18eb49ab9ab42db4359f0ccc91de5c72818.tar.gz Qt-8c13e18eb49ab9ab42db4359f0ccc91de5c72818.tar.bz2 | |
Merge commit 'widget/4.6' into oslo-staging-2/4.6
Conflicts:
src/gui/painting/qbrush.cpp
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index 3d4bb8c..192f9ac 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -601,6 +601,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures, Qt::GestureType gestureType = gesture->gestureType(); Q_ASSERT(gestureType != Qt::CustomGesture); + Q_UNUSED(gestureType); if (target) { if (gesture->state() == Qt::GestureStarted) { |