diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 13:20:37 +0100 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 13:20:37 +0100 |
| commit | 09d00073e50957ca183e40f0d22aeef9c82edb49 (patch) | |
| tree | fb53d8e800ae1d5e2740ec35b47ebea86eb2a008 /src/gui/kernel/qapplication_win.cpp | |
| parent | 9fbcda80c8857202db01f58a9568e16604518b88 (diff) | |
| parent | d6a23684c8546fcd20ac032aa01985ca7ac69128 (diff) | |
Merge branch '4.6-platform' into 4.6
Diffstat (limited to 'src/gui/kernel/qapplication_win.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 387c29b5d1..05e75a2cac 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -832,6 +832,7 @@ void qt_init(QApplicationPrivate *priv, int) priv->GetGestureInfo = (PtrGetGestureInfo) &TKGetGestureInfo; priv->GetGestureExtraArgs = (PtrGetGestureExtraArgs) &TKGetGestureExtraArguments; #elif !defined(Q_WS_WINCE) + #if !defined(QT_NO_NATIVE_GESTURES) priv->GetGestureInfo = (PtrGetGestureInfo)QLibrary::resolve(QLatin1String("user32"), "GetGestureInfo"); @@ -847,6 +848,7 @@ void qt_init(QApplicationPrivate *priv, int) priv->GetGestureConfig = (PtrGetGestureConfig)QLibrary::resolve(QLatin1String("user32"), "GetGestureConfig"); + #endif // QT_NO_NATIVE_GESTURES priv->BeginPanningFeedback = (PtrBeginPanningFeedback)QLibrary::resolve(QLatin1String("uxtheme"), "BeginPanningFeedback"); |