diff options
| author | Robert Griebl <robert.griebl@nokia.com> | 2010-12-02 14:39:29 (GMT) |
|---|---|---|
| committer | Robert Griebl <robert.griebl@nokia.com> | 2010-12-02 14:39:53 (GMT) |
| commit | fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d (patch) | |
| tree | ecdbecf6a138ff553374b13a0db0a6a0e57afa2b /src | |
| parent | 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 (diff) | |
| download | Qt-fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d.zip Qt-fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d.tar.gz Qt-fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d.tar.bz2 | |
Simple fixes for CI gate
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/util/qscroller.cpp | 2 | ||||
| -rw-r--r-- | src/gui/util/qscroller.h | 2 | ||||
| -rw-r--r-- | src/gui/util/qscrollerproperties.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/util/qscroller.cpp b/src/gui/util/qscroller.cpp index 5aa2b71..b7b5903 100644 --- a/src/gui/util/qscroller.cpp +++ b/src/gui/util/qscroller.cpp @@ -367,7 +367,7 @@ void QScroller::setScrollerProperties(const QScrollerProperties &sp) emit scrollerPropertiesChanged(sp); // we need to force the recalculation here, since the overshootPolicy may have changed and - // exisiting segments may include an overshoot animation. + // existing segments may include an overshoot animation. d->recalcScrollingSegments(true); } } diff --git a/src/gui/util/qscroller.h b/src/gui/util/qscroller.h index 34e1125..7d7e1ca 100644 --- a/src/gui/util/qscroller.h +++ b/src/gui/util/qscroller.h @@ -71,7 +71,7 @@ public: Inactive, Pressed, Dragging, - Scrolling, + Scrolling }; enum ScrollerGestureType diff --git a/src/gui/util/qscrollerproperties.h b/src/gui/util/qscrollerproperties.h index 5284876..e292d8d 100644 --- a/src/gui/util/qscrollerproperties.h +++ b/src/gui/util/qscrollerproperties.h @@ -132,8 +132,8 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QScrollerProperties::OvershootPolicy); -Q_DECLARE_METATYPE(QScrollerProperties::FrameRates); +Q_DECLARE_METATYPE(QScrollerProperties::OvershootPolicy) +Q_DECLARE_METATYPE(QScrollerProperties::FrameRates) QT_END_HEADER |