diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-01-06 17:16:27 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-01-07 09:52:29 (GMT) |
| commit | 828b1299e1ecb2da23799a2e49370e00dcf9c126 (patch) | |
| tree | 6bbb15ada48bfbaf71f36c5c28e2d94c96d4b180 /src/gui/kernel/qgesturemanager_p.h | |
| parent | 089ee7094eabb2058b478f5d2f306a69f6c0b3bf (diff) | |
| download | Qt-828b1299e1ecb2da23799a2e49370e00dcf9c126.zip Qt-828b1299e1ecb2da23799a2e49370e00dcf9c126.tar.gz Qt-828b1299e1ecb2da23799a2e49370e00dcf9c126.tar.bz2 | |
Fixes a crash when destroying and creating QApplication.
Moved the gestureManager pointer to a QApplicationPrivate to make sure if
QApplication object is destroyed, QGestureManager pointer is set to zero.
Task-number: QTBUG-7029
Reviewed-by: Thiago
Diffstat (limited to 'src/gui/kernel/qgesturemanager_p.h')
| -rw-r--r-- | src/gui/kernel/qgesturemanager_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h index 06dcc3e..a0ff83f 100644 --- a/src/gui/kernel/qgesturemanager_p.h +++ b/src/gui/kernel/qgesturemanager_p.h @@ -78,7 +78,7 @@ public: bool filterEvent(QGraphicsObject *receiver, QEvent *event); #endif //QT_NO_GRAPHICSVIEW - static QGestureManager* instance(); + static QGestureManager* instance(); // declared in qapplication.cpp void cleanupCachedGestures(QObject *target, Qt::GestureType type); @@ -142,8 +142,6 @@ private: void cancelGesturesForChildren(QGesture *originatingGesture); }; -extern QGestureManager *qt_gestureManager; - QT_END_NAMESPACE #endif // QGESTUREMANAGER_P_H |