diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/kernel/qapplication_p.h --- a/src/gui/kernel/qapplication_p.h Tue Jan 26 12:42:25 2010 +0200 +++ b/src/gui/kernel/qapplication_p.h Tue Feb 02 00:43:10 2010 +0200 @@ -72,7 +72,7 @@ #include #endif #ifdef Q_OS_SYMBIAN -#include +#include #endif QT_BEGIN_NAMESPACE @@ -84,7 +84,6 @@ class QObject; class QWidget; class QSocketNotifier; -class QGestureManager; extern bool qt_is_gui_used; #ifndef QT_NO_CLIPBOARD @@ -441,9 +440,6 @@ #ifdef Q_WS_MAC static bool native_modal_dialog_active; #endif -#if defined(Q_WS_WIN) && !defined(Q_WS_WINCE) - static bool inSizeMove; -#endif static void setSystemPalette(const QPalette &pal); static void setPalette_helper(const QPalette &palette, const char* className, bool clearWidgetPaletteHash); @@ -513,9 +509,9 @@ void sendSyntheticEnterLeave(QWidget *widget); #endif - QGestureManager *gestureManager; + QWidget *gestureWidget; - QMap widgetForTouchPointId; + QMap > widgetForTouchPointId; QMap appCurrentTouchPoints; static void updateTouchPointsForWidget(QWidget *widget, QTouchEvent *touchEvent); void initializeMultitouch();