diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 14:59:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 14:59:56 (GMT) |
| commit | 219175903f9722bee12271321614cdaeb88eb914 (patch) | |
| tree | 8451797482725dc11d351667e0945de2e57644f2 /src/gui/widgets/qabstractscrollarea_p.h | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| parent | 4f7af4c544c3b793ba8cccb28e5c856f3d754e4a (diff) | |
| download | Qt-219175903f9722bee12271321614cdaeb88eb914.zip Qt-219175903f9722bee12271321614cdaeb88eb914.tar.gz Qt-219175903f9722bee12271321614cdaeb88eb914.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert all QScroller and QFlickGesture related code.
Fix regression that caused waitForXXX(-1) to fail.
Diffstat (limited to 'src/gui/widgets/qabstractscrollarea_p.h')
| -rw-r--r-- | src/gui/widgets/qabstractscrollarea_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/gui/widgets/qabstractscrollarea_p.h index 76e1c34..85536e3 100644 --- a/src/gui/widgets/qabstractscrollarea_p.h +++ b/src/gui/widgets/qabstractscrollarea_p.h @@ -84,13 +84,11 @@ public: int left, top, right, bottom; // viewport margin int xoffset, yoffset; - QPoint overshoot; void init(); void layoutChildren(); // ### Fix for 4.4, talk to Bjoern E or Girish. virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {} - bool canStartScrollingAt( const QPoint &startPos ); void _q_hslide(int); void _q_vslide(int); |