summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorJeremy Katz <jeremy.katz@nokia.com>2012-06-29 13:19:26 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-06 13:43:11 +0200
commit2b1a501ac5d3aa36ac44d1dda5f4f9a1794dfeca (patch)
tree5e2fdd2834a70ece4f6873360f77b4c8883aef83 /src/gui
parentb6e26b5b191749b9302731a6a2e6facf7f072a31 (diff)
make QtGui compile when QT_NO_WHEELEVENT is defined
This is necesary but not sufficient to make the small configuration build. Task-number: QTBUG-24816 Change-Id: I1a06555e6f54f4d3c09a34fd50bf76e7b47d469f Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qguiapplication.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 33dd883472..0cc4ef65d4 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1301,6 +1301,7 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::WheelEvent *e)
{
+#ifndef QT_NO_WHEELEVENT
QWindow *window = e->window.data();
QPointF globalPoint = e->globalPos;
QPointF localPoint = e->localPos;
@@ -1327,6 +1328,7 @@ void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::Wh
QWheelEvent ev(localPoint, globalPoint, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation, buttons, e->modifiers);
ev.setTimestamp(e->timestamp);
QGuiApplication::sendSpontaneousEvent(window, &ev);
+#endif /* ifndef QT_NO_WHEELEVENT */
}
// Remember, Qt convention is: keyboard state is state *before*