make QtGui compile when QT_NO_WHEELEVENT is defined
authorJeremy Katz <jeremy.katz@nokia.com>
Fri, 29 Jun 2012 11:19:26 +0000 (13:19 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 6 Jul 2012 11:43:11 +0000 (13:43 +0200)
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>
src/gui/kernel/qguiapplication.cpp

index 33dd883..0cc4ef6 100644 (file)
@@ -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*