diff options
| author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2009-10-13 13:43:56 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-13 14:30:22 (GMT) |
| commit | 15d44ea32164a1205bef7938da331457054f8df4 (patch) | |
| tree | f06bc4bf1baa71324d36d6efa15993de8e7f8c6a | |
| parent | 1fb2cc6241d715a641dd6bee48eb9bcafaf558b1 (diff) | |
| download | Qt-15d44ea32164a1205bef7938da331457054f8df4.zip Qt-15d44ea32164a1205bef7938da331457054f8df4.tar.gz Qt-15d44ea32164a1205bef7938da331457054f8df4.tar.bz2 | |
crash fix on WinCE without gesture support
dd9d8693 added some checks causing SetGestureConfig to not be
initialized to 0. Thus it gets derefenced and causes crashes on all
WinCE applications.
Reviewed-by: denis
Reviewed-by: ninerider
(cherry picked from commit fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3)
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 540f0a2..5bb25fa 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -819,13 +819,16 @@ void qt_init(QApplicationPrivate *priv, int) priv->GetGestureInfo = 0; priv->GetGestureExtraArgs = 0; + priv->CloseGestureInfoHandle = 0; + priv->SetGestureConfig = 0; + priv->GetGestureConfig = 0; + priv->BeginPanningFeedback = 0; + priv->UpdatePanningFeedback = 0; + priv->EndPanningFeedback = 0; #if defined(Q_WS_WINCE_WM) && defined(QT_WINCE_GESTURES) priv->GetGestureInfo = (PtrGetGestureInfo) &TKGetGestureInfo; priv->GetGestureExtraArgs = (PtrGetGestureExtraArgs) &TKGetGestureExtraArguments; - priv->CloseGestureInfoHandle = (PtrCloseGestureInfoHandle) 0; - priv->SetGestureConfig = (PtrSetGestureConfig) 0; - priv->GetGestureConfig = (PtrGetGestureConfig) 0; #elif !defined(Q_WS_WINCE) priv->GetGestureInfo = (PtrGetGestureInfo)QLibrary::resolve(QLatin1String("user32"), |