diff options
| author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2009-10-13 13:43:56 (GMT) |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2009-10-13 13:45:45 (GMT) |
| commit | fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3 (patch) | |
| tree | c4c6897e5a587871c7c547339c5dfc4f62df7701 | |
| parent | 5b28eb78f6580ab942d3005992843ea1e7a0504d (diff) | |
| download | Qt-fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3.zip Qt-fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3.tar.gz Qt-fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3.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
| -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"), |