diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-09 11:33:52 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-10 14:41:58 (GMT) |
| commit | 5ab191af20bf2b1fed2b8886ac247c2953087c14 (patch) | |
| tree | b6ef3fa71ef65d7016ebd2cc2a11659f39f57c9d /src/gui/kernel/qapplication_mac.mm | |
| parent | e950fad2ab8b0c93da176ce2f07a4d45a3185cb4 (diff) | |
| download | Qt-5ab191af20bf2b1fed2b8886ac247c2953087c14.zip Qt-5ab191af20bf2b1fed2b8886ac247c2953087c14.tar.gz Qt-5ab191af20bf2b1fed2b8886ac247c2953087c14.tar.bz2 | |
Fixed compilation with QT_NO_WHEELEVENT
Reviewed-by: Prasanth
Diffstat (limited to 'src/gui/kernel/qapplication_mac.mm')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index e8b821af..54a4901 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -2143,6 +2143,7 @@ QApplicationPrivate::globalEventProcessor(EventHandlerCallRef er, EventRef event } if (wheel_deltaX || wheel_deltaY) { +#ifndef QT_NO_WHEELEVENT if (wheel_deltaX) { QWheelEvent qwe(plocal, p, wheel_deltaX, buttons, modifiers, Qt::Horizontal); QApplication::sendSpontaneousEvent(widget, &qwe); @@ -2165,6 +2166,7 @@ QApplicationPrivate::globalEventProcessor(EventHandlerCallRef er, EventRef event handled_event = false; } } +#endif // QT_NO_WHEELEVENT } else { #ifdef QMAC_SPEAK_TO_ME const int speak_keys = Qt::AltModifier | Qt::ShiftModifier; @@ -2717,6 +2719,7 @@ int QApplication::keyboardInputInterval() return QApplicationPrivate::keyboard_input_time; } +#ifndef QT_NO_WHEELEVENT void QApplication::setWheelScrollLines(int n) { QApplicationPrivate::wheel_scroll_lines = n; @@ -2726,6 +2729,7 @@ int QApplication::wheelScrollLines() { return QApplicationPrivate::wheel_scroll_lines; } +#endif void QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable) { @@ -2888,9 +2892,11 @@ bool QApplicationPrivate::qt_mac_apply_settings() QApplication::cursorFlashTime()).toInt(); QApplication::setCursorFlashTime(num); +#ifndef QT_NO_WHEELEVENT num = settings.value(QLatin1String("wheelScrollLines"), QApplication::wheelScrollLines()).toInt(); QApplication::setWheelScrollLines(num); +#endif QString colorspec = settings.value(QLatin1String("colorSpec"), QVariant(QLatin1String("default"))).toString(); |