diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-01-06 18:16:27 +0100 |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-13 10:47:39 +0100 |
| commit | 09b7479c73d3da868c04752c621af30f505559dc (patch) | |
| tree | 89b12b07d3ec20ad2e23f88e16817f42c57b210a /src/gui/kernel/qgesturemanager.cpp | |
| parent | 6649a1f1340a6e3bf6fcc61e641add504797d77a (diff) | |
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
(cherry picked from commit 828b1299e1ecb2da23799a2e49370e00dcf9c126)
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index 475765673a..a4604bfdf7 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -67,15 +67,6 @@ QT_BEGIN_NAMESPACE -QGestureManager *qt_gestureManager = 0; - -QGestureManager* QGestureManager::instance() -{ - if (!qt_gestureManager) - qt_gestureManager = new QGestureManager(qApp); - return qt_gestureManager; -} - QGestureManager::QGestureManager(QObject *parent) : QObject(parent), state(NotGesture), m_lastCustomGestureId(0) { |