diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-20 21:30:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-20 21:30:05 +0100 |
| commit | 759cdce3e6d22995106cfec0f1e6c6cbd3fdf266 (patch) | |
| tree | 0786bd9d91492a784859578b136de9abc1dbba45 /src/imports | |
| parent | ee6ab05bba3622adcaf1787947b239659b8ac241 (diff) | |
| parent | 15416b1ffc6ce83a11bfe5d05e97ecdc45d3411c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7b98beb61f73a74b80cf80a49b63819aa6eb528e
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/layouts/qquicklayout.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp index 7d51ec3ca9..3bfdea5be7 100644 --- a/src/imports/layouts/qquicklayout.cpp +++ b/src/imports/layouts/qquicklayout.cpp @@ -771,8 +771,9 @@ bool QQuickLayout::shouldIgnoreItem(QQuickItem *child, QQuickLayoutAttached *&in void QQuickLayout::checkAnchors(QQuickItem *item) const { - if (QQuickItemPrivate::get(item)->_anchors) - qmlWarning(item) << "Detected anchors on an item that is part of a layout. This is undefined behavior."; + QQuickAnchors *anchors = QQuickItemPrivate::get(item)->_anchors; + if (anchors && anchors->activeDirections()) + qmlWarning(item) << "Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead."; } void QQuickLayout::itemChange(ItemChange change, const ItemChangeData &value) |