summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-08-10 15:15:03 (GMT)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2009-08-10 15:15:03 (GMT)
commit35ef002453cbe9841e23a7d33064a51dbe99fb06 (patch)
treeba019c2e4da2a9453d6427448fc29fd7b89db9cd /src/gui
parentd7acc28c68ae02b530ba53667b165e844293b4e9 (diff)
downloadQt-35ef002453cbe9841e23a7d33064a51dbe99fb06.zip
Qt-35ef002453cbe9841e23a7d33064a51dbe99fb06.tar.gz
Qt-35ef002453cbe9841e23a7d33064a51dbe99fb06.tar.bz2
Manual merge
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qapplication_win.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 5843c34..bb910b7 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -3728,7 +3728,7 @@ bool QETWidget::translateGestureEvent(const MSG &msg)
memset(&gi, 0, sizeof(GESTUREINFO));
gi.cbSize = sizeof(GESTUREINFO);
- QApplicationPrivate *qAppPriv = getQApplicationPrivateInternal();
+ QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
#ifdef Q_WS_WINCE_WM
#define GID_ZOOM 0xf000
#define GID_ROTATE 0xf001
@@ -3739,8 +3739,6 @@ bool QETWidget::translateGestureEvent(const MSG &msg)
if (qAppPriv->GetGestureInfo)
bResult = qAppPriv->GetGestureInfo((HANDLE)msg.lParam, &gi);
- QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
- BOOL bResult = qAppPriv->GetGestureInfo((HANDLE)msg.lParam, &gi);
if (bResult) {
const QPoint widgetPos = QPoint(gi.ptsLocation.x, gi.ptsLocation.y);
QWidget *alienWidget = !internalWinId() ? this : childAt(widgetPos);