diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 01:00:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 01:00:50 +0100 |
| commit | 573afc9fdd093724dd58f818b965f42fca8bd1a8 (patch) | |
| tree | c1d743037b6887fa6d0df99e1ecd89f8da61788b /src/quick/items | |
| parent | 7d80264fa7fc71bc68ed091ff8ba97bdd7970dc4 (diff) | |
| parent | 03097d5038fe6331df97182a38fac3a9a84fe195 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie33d1c736992abcbde6568131374a7a7891f965c
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquicktableview_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktableview_p.h b/src/quick/items/qquicktableview_p.h index c5197b4230..f32c71b983 100644 --- a/src/quick/items/qquicktableview_p.h +++ b/src/quick/items/qquicktableview_p.h @@ -78,7 +78,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTableView : public QQuickFlickable Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(bool reuseItems READ reuseItems WRITE setReuseItems NOTIFY reuseItemsChanged) Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentWidth NOTIFY contentHeightChanged) + Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged) public: QQuickTableView(QQuickItem *parent = nullptr); |