--- a/src/gui/kernel/qapplication_p.h	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/gui/kernel/qapplication_p.h	Wed Aug 18 10:37:55 2010 +0300
@@ -84,7 +84,9 @@
 class QObject;
 class QWidget;
 class QSocketNotifier;
+#ifndef QT_NO_GESTURES
 class QGestureManager;
+#endif
 
 extern bool qt_is_gui_used;
 #ifndef QT_NO_CLIPBOARD
@@ -200,6 +202,7 @@
 typedef BOOL (WINAPI *PtrGetTouchInputInfo)(HANDLE, UINT, PVOID, int);
 typedef BOOL (WINAPI *PtrCloseTouchInputHandle)(HANDLE);
 
+#ifndef QT_NO_GESTURES
 typedef BOOL (WINAPI *PtrGetGestureInfo)(HANDLE, PVOID);
 typedef BOOL (WINAPI *PtrGetGestureExtraArgs)(HANDLE, UINT, PBYTE);
 typedef BOOL (WINAPI *PtrCloseGestureInfoHandle)(HANDLE);
@@ -263,6 +266,8 @@
 #define GID_ROLLOVER 0xf003
 #endif
 
+#endif // QT_NO_GESTURES
+
 #endif // Q_WS_WIN
 
 class QScopedLoopLevelCounter
@@ -412,6 +417,7 @@
     static QPalette *set_pal;
     static QGraphicsSystem *graphics_system;
     static QString graphics_system_name;
+    static bool runtime_graphics_system;
 
 private:
     static QFont *app_font; // private for a reason! Always use QApplication::font() instead!
@@ -518,6 +524,7 @@
     void sendSyntheticEnterLeave(QWidget *widget);
 #endif
 
+#ifndef QT_NO_GESTURES
     QGestureManager *gestureManager;
     QWidget *gestureWidget;
 #if defined(Q_WS_X11) || defined(Q_WS_WIN)
@@ -525,6 +532,7 @@
     QPixmap *copy_cursor;
     QPixmap *link_cursor;
 #endif
+#endif
 #if defined(Q_WS_WIN)
     QPixmap *ignore_cursor;
 #endif
@@ -553,6 +561,7 @@
     QHash<DWORD, int> touchInputIDToTouchPointID;
     bool translateTouchEvent(const MSG &msg);
 
+#ifndef QT_NO_GESTURES
     PtrGetGestureInfo GetGestureInfo;
     PtrGetGestureExtraArgs GetGestureExtraArgs;
     PtrCloseGestureInfoHandle CloseGestureInfoHandle;
@@ -561,6 +570,7 @@
     PtrBeginPanningFeedback BeginPanningFeedback;
     PtrUpdatePanningFeedback UpdatePanningFeedback;
     PtrEndPanningFeedback EndPanningFeedback;
+#endif // QT_NO_GESTURES
 #endif
 
 #ifdef QT_RX71_MULTITOUCH
@@ -581,7 +591,8 @@
     void _q_readRX71MultiTouchEvents();
 #endif
 
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
+    int pressureSupported;
     int maxTouchPressure;
     QList<QTouchEvent::TouchPoint> appAllTouchPoints;
 #endif