diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 02:05:48 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 02:05:48 +1000 |
| commit | 8bc5a6319455d7dc0655a8c48862ada8890b0064 (patch) | |
| tree | 2f43d23e5a30e9f2c18698038291c74254db480a /src/gui/kernel/qapplication.cpp | |
| parent | 013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f (diff) | |
| parent | 156893a247f1c24094129b6f5151c8b821d8b1b5 (diff) | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 361ec6ddec..cd13894609 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -1019,6 +1019,10 @@ void QApplicationPrivate::initialize() QApplicationPrivate::wheel_scroll_lines = 3; #endif +#ifdef Q_WS_S60 + q->setAttribute(Qt::AA_S60DisablePartialScreenInputMode); +#endif + if (qt_is_gui_used) initializeMultitouch(); } |