diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
| commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
| tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/quick/items/qquicklistview_p.h | |
| parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
| parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/quick/items/qquicklistview_p.h')
| -rw-r--r-- | src/quick/items/qquicklistview_p.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index 3a871e88e9..f8db0f0f8f 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -146,7 +146,7 @@ public: QQuickViewSection *sectionCriteria(); QString currentSection() const; - void setHighlightFollowsCurrentItem(bool) Q_DECL_OVERRIDE; + void setHighlightFollowsCurrentItem(bool) override; qreal highlightMoveVelocity() const; void setHighlightMoveVelocity(qreal); @@ -157,7 +157,7 @@ public: int highlightResizeDuration() const; void setHighlightResizeDuration(int); - void setHighlightMoveDuration(int) Q_DECL_OVERRIDE; + void setHighlightMoveDuration(int) override; enum SnapMode { NoSnap, SnapToItem, SnapOneItem }; Q_ENUM(SnapMode) @@ -192,10 +192,12 @@ Q_SIGNALS: Q_REVISION(2) void footerPositioningChanged(); protected: - void viewportMoved(Qt::Orientations orient) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry,const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void initItem(int index, QObject *item) Q_DECL_OVERRIDE; + void viewportMoved(Qt::Orientations orient) override; + void keyPressEvent(QKeyEvent *) override; + void geometryChanged(const QRectF &newGeometry,const QRectF &oldGeometry) override; + void initItem(int index, QObject *item) override; + qreal maxYExtent() const override; + qreal maxXExtent() const override; }; class QQuickListViewAttached : public QQuickItemViewAttached |