diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-06-01 17:40:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-06-01 17:40:53 (GMT) |
| commit | 5c6e671c8cbab281af4685d3698790ab566ed2f2 (patch) | |
| tree | 0f3e15d12cf984d8f49c7adfaf056063cc726803 /src/gui/kernel/qapplication_p.h | |
| parent | 7165826d2e9ff77951a289c62746d6c87f725139 (diff) | |
| parent | 0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d (diff) | |
| download | Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.zip Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.gz Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 25dea1f..9a5714b 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -412,6 +412,7 @@ public: 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! @@ -579,7 +580,8 @@ public: void _q_readRX71MultiTouchEvents(); #endif -#if defined(Q_WS_S60) +#if defined(Q_OS_SYMBIAN) + int pressureSupported; int maxTouchPressure; QList<QTouchEvent::TouchPoint> appAllTouchPoints; #endif |