diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:46:38 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:02:37 +0200 |
| commit | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (patch) | |
| tree | c6f7e058a985d7c18b51cadc76283caf555071c9 /src/quick/items/qquickflickable_p_p.h | |
| parent | 9e633bbda7608ac0231809e2a6a97ae8f2d849d6 (diff) | |
| parent | 803f18f02e5609a1ca00a5b78ea6d3613d44e1a0 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.
Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922
Diffstat (limited to 'src/quick/items/qquickflickable_p_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 835c54170f..1ff55dae90 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -284,6 +284,7 @@ class QQuickFlickableVisibleArea : public QObject Q_PROPERTY(qreal yPosition READ yPosition NOTIFY yPositionChanged) Q_PROPERTY(qreal widthRatio READ widthRatio NOTIFY widthRatioChanged) Q_PROPERTY(qreal heightRatio READ heightRatio NOTIFY heightRatioChanged) + QML_ANONYMOUS public: QQuickFlickableVisibleArea(QQuickFlickable *parent=nullptr); |