diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:59:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:59:32 +0100 |
| commit | fc9ee5223e2a533abc9e82dbf19253b788ac457b (patch) | |
| tree | c2d4f5acba2e97189672b2fc6aea6253c678dc7e /src/templates/qquickstackview_p.cpp | |
| parent | f787a0353a347aa096d154b7d93c7890f0cd060a (diff) | |
| parent | f56ec245eab24d56800a24f5bc06de1de4f87293 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692
Diffstat (limited to 'src/templates/qquickstackview_p.cpp')
| -rw-r--r-- | src/templates/qquickstackview_p.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/templates/qquickstackview_p.cpp b/src/templates/qquickstackview_p.cpp index 63cc1800..f03ff7fc 100644 --- a/src/templates/qquickstackview_p.cpp +++ b/src/templates/qquickstackview_p.cpp @@ -36,6 +36,7 @@ #include "qquickstackview_p_p.h" +#include <QtQml/qqmlinfo.h> #include <QtQml/qqmllist.h> #include <QtQml/qqmlengine.h> #include <QtQml/qqmlcomponent.h> @@ -227,6 +228,13 @@ void QQuickStackElement::transitionNextReposition(QQuickItemViewTransitioner *tr bool QQuickStackElement::prepareTransition(QQuickItemViewTransitioner *transitioner, const QRectF &viewBounds) { if (transitioner) { + if (item) { + QQuickAnchors *anchors = QQuickItemPrivate::get(item)->_anchors; + // TODO: expose QQuickAnchorLine so we can test for other conflicting anchors + if (anchors && (anchors->fill() || anchors->centerIn())) + qmlInfo(item) << "StackView has detected conflicting anchors. Transitions may not execute properly."; + } + // TODO: add force argument to QQuickItemViewTransitionableItem::prepareTransition()? nextTransitionToSet = true; nextTransitionFromSet = true; |