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_x11.cpp | |
| 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_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 2a1f655..afd927b 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -944,10 +944,12 @@ bool QApplicationPrivate::x11_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(); @@ -4401,8 +4403,10 @@ bool QETWidget::translateWheelEvent(int global_x, int global_y, int delta, QWidget* popup = qApp->activePopupWidget(); if (popup && window() != popup) popup->close(); +#ifndef QT_NO_WHEELEVENT QWheelEvent e(pos, globalPos, delta, buttons, modifiers, orient); if (QApplication::sendSpontaneousEvent(widget, &e)) +#endif return true; } @@ -4413,8 +4417,10 @@ bool QETWidget::translateWheelEvent(int global_x, int global_y, int delta, QWidget* popup = qApp->activePopupWidget(); if (popup && widget != popup) popup->hide(); +#ifndef QT_NO_WHEELEVENT QWheelEvent e(pos, globalPos, delta, buttons, modifiers, orient); if (QApplication::sendSpontaneousEvent(widget, &e)) +#endif return true; } return false; @@ -5313,6 +5319,7 @@ int QApplication::keyboardInputInterval() return QApplicationPrivate::keyboard_input_time; } +#ifndef QT_NO_WHEELEVENT void QApplication::setWheelScrollLines(int n) { QApplicationPrivate::wheel_scroll_lines = n; @@ -5322,6 +5329,7 @@ int QApplication::wheelScrollLines() { return QApplicationPrivate::wheel_scroll_lines; } +#endif void QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable) { |