diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-19 18:23:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-19 18:23:11 (GMT) |
| commit | b4c12d184aa673003bdcd1a9ccd0a863774bc1c9 (patch) | |
| tree | cde95979635f6be28d8cd4159d094b2704d8557d | |
| parent | 9b1366cb9f12afc366bf3c448564a6c197153a3d (diff) | |
| parent | 914679fcdfa1400dd68c98a247378860b8bcb1bb (diff) | |
| download | Qt-b4c12d184aa673003bdcd1a9ccd0a863774bc1c9.zip Qt-b4c12d184aa673003bdcd1a9ccd0a863774bc1c9.tar.gz Qt-b4c12d184aa673003bdcd1a9ccd0a863774bc1c9.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
Fix m_longTapDetector causing crash.
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 14 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 48767b8..1518d2d 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -556,7 +556,7 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) SetFocusing(true); m_longTapDetector = QLongTapTimer::NewL(this); m_doubleClickTimer.invalidate(); - + DrawableWindow()->SetPointerGrab(ETrue); } } @@ -600,7 +600,7 @@ QSymbianControl::~QSymbianControl() } QT_CATCH(const std::exception&) { // ignore exceptions, nothing can be done } - + if (S60->curWin == this) S60->curWin = 0; if (!QApplicationPrivate::is_app_closing) { @@ -830,7 +830,8 @@ void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent) const TPointerEvent *pointerEvent = eventData.Pointer(i); const TAdvancedPointerEvent *advEvent = pointerEvent->AdvancedPointerEvent(); if (!advEvent || advEvent->PointerNumber() == 0) { - m_longTapDetector->PointerEventL(*pointerEvent); + if (m_longTapDetector) + m_longTapDetector->PointerEventL(*pointerEvent); QT_TRYCATCH_LEAVING(HandlePointerEvent(*pointerEvent)); } } @@ -847,8 +848,8 @@ void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent) } } #endif - - m_longTapDetector->PointerEventL(pEvent); + if (m_longTapDetector) + m_longTapDetector->PointerEventL(pEvent); QT_TRYCATCH_LEAVING(HandlePointerEvent(pEvent)); } @@ -1718,7 +1719,8 @@ void QSymbianControl::HandleResourceChange(int resourceType) } void QSymbianControl::CancelLongTapTimer() { - m_longTapDetector->Cancel(); + if (m_longTapDetector) + m_longTapDetector->Cancel(); } TTypeUid::Ptr QSymbianControl::MopSupplyObject(TTypeUid id) diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 7055c6b..bceda66 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -314,6 +314,7 @@ QWidgetPrivate::QWidgetPrivate(int version) #elif defined(Q_OS_SYMBIAN) , symbianScreenNumber(0) , fixNativeOrientationCalled(false) + , isGLGlobalShareWidget(0) #endif { if (!qApp) { |