diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-29 05:35:30 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-29 05:35:30 (GMT) |
| commit | fbf4dc0f22177375d4591e76cf1c243c3cf985e2 (patch) | |
| tree | 54fa0880f7ccbe6c07ee45c06c92f8f92c2c8b87 /src/gui/kernel/qapplication.cpp | |
| parent | 6c3b7fb91fe512479f7321eb4d3f577cb8bbd1a7 (diff) | |
| parent | e532322a7bb58f6b2527fa42063b5bccde318105 (diff) | |
| download | Qt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.zip Qt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.tar.gz Qt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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 7c38d4b..85b055e 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -940,12 +940,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(); } |