summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qabstractscrollarea_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets/qabstractscrollarea_p.h')
-rw-r--r--src/gui/widgets/qabstractscrollarea_p.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/gui/widgets/qabstractscrollarea_p.h
index ba823b3..000da74 100644
--- a/src/gui/widgets/qabstractscrollarea_p.h
+++ b/src/gui/widgets/qabstractscrollarea_p.h
@@ -60,9 +60,10 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_SCROLLAREA
+class QPanGesture;
class QScrollBar;
class QAbstractScrollAreaScrollBarContainer;
-class Q_GUI_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate
+class Q_AUTOTEST_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate
{
Q_DECLARE_PUBLIC(QAbstractScrollArea)
@@ -88,7 +89,7 @@ public:
void init();
void layoutChildren();
// ### Fix for 4.4, talk to Bjoern E or Girish.
- virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy);
+ virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {}
void _q_hslide(int);
void _q_vslide(int);
@@ -98,7 +99,14 @@ public:
inline bool viewportEvent(QEvent *event)
{ return q_func()->viewportEvent(event); }
- QObject *viewportFilter;
+ QScopedPointer<QObject> viewportFilter;
+
+#ifdef Q_WS_WIN
+ QPanGesture *panGesture;
+ virtual void _q_gestureTriggered();
+ bool singleFingerPanEnabled;
+ void setSingleFingerPanEnabled(bool on = true);
+#endif
};
class QAbstractScrollAreaFilter : public QObject