diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-29 14:17:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-29 14:17:58 (GMT) |
| commit | e336c7a35f98d53f5746bbe8c0c7fbbaa0cf96e9 (patch) | |
| tree | d13c48f4aa523de9aff848b3b557a36b1ab7870e /src/gui/kernel/qapplication.cpp | |
| parent | 732bd6893a9e65d33927b9083fe5e30c0864e409 (diff) | |
| parent | 8331d6dab88b589164e27e8f44980c742835a729 (diff) | |
| download | Qt-e336c7a35f98d53f5746bbe8c0c7fbbaa0cf96e9.zip Qt-e336c7a35f98d53f5746bbe8c0c7fbbaa0cf96e9.tar.gz Qt-e336c7a35f98d53f5746bbe8c0c7fbbaa0cf96e9.tar.bz2 | |
Merge branch '4.6'
Conflicts:
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 175fb16..0fb38d6 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -948,12 +948,8 @@ void QApplicationPrivate::initialize() graphics_system = QGraphicsSystemFactory::create(graphics_system_name); #endif #ifndef QT_NO_WHEELEVENT -#ifdef Q_OS_MAC - QApplicationPrivate::wheel_scroll_lines = 1; -#else QApplicationPrivate::wheel_scroll_lines = 3; #endif -#endif initializeMultitouch(); } |