Changeset 846 for trunk/src/gui/widgets/qabstractscrollarea.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qabstractscrollarea.cpp (modified) (7 diffs)

trunk/src/gui/widgets/qabstractscrollarea.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -296 +296 @@
     layoutChildren();
 #ifndef Q_WS_MAC
+#ifndef QT_NO_GESTURES
     viewport->grabGesture(Qt::PanGesture);
+#endif
 #endif
 }
@@ -547 +549 @@
         d->viewport->installEventFilter(d->viewportFilter.data());
 #ifndef Q_WS_MAC
+#ifndef QT_NO_GESTURES
         d->viewport->grabGesture(Qt::PanGesture);
+#endif
 #endif
         d->layoutChildren();
@@ -961 +965 @@
     case QEvent::TouchEnd:
         return false;
+#ifndef QT_NO_GESTURES
     case QEvent::Gesture:
     {
@@ -981 +986 @@
         return false;
     }
+#endif // QT_NO_GESTURES
     case QEvent::StyleChange:
     case QEvent::LayoutDirectionChange:
     case QEvent::ApplicationLayoutDirectionChange:
+    case QEvent::LayoutRequest:
         d->layoutChildren();
         // fall through
@@ -1006 +1013 @@
   using one of the specialized event handlers instead.
 
-  Specialised handlers for viewport events are: paintEvent(),
+  Specialized handlers for viewport events are: paintEvent(),
   mousePressEvent(), mouseReleaseEvent(), mouseDoubleClickEvent(),
   mouseMoveEvent(), wheelEvent(), dragEnterEvent(), dragMoveEvent(),
@@ -1036 +1043 @@
         return QFrame::event(e);
     case QEvent::LayoutRequest:
+#ifndef QT_NO_GESTURES
     case QEvent::Gesture:
     case QEvent::GestureOverride:
         return event(e);
+#endif
     default:
         break;