1 files changed, 25 insertions, 12 deletions

diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index 45b405bd82..8ee4229013 100644
--- a/src/quick/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
@@ -252,35 +252,35 @@ void QQuickAnchorsPrivate::clearItem(QQuickItem *item)
     if (!item)
         return;
     if (fill == item)
-        fill = 0;
+        fill = nullptr;
     if (centerIn == item)
-        centerIn = 0;
+        centerIn = nullptr;
     if (leftAnchorItem == item) {
-        leftAnchorItem = 0;
+        leftAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::LeftAnchor;
     }
     if (rightAnchorItem == item) {
-        rightAnchorItem = 0;
+        rightAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::RightAnchor;
     }
     if (topAnchorItem == item) {
-        topAnchorItem = 0;
+        topAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::TopAnchor;
     }
     if (bottomAnchorItem == item) {
-        bottomAnchorItem = 0;
+        bottomAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::BottomAnchor;
     }
     if (vCenterAnchorItem == item) {
-        vCenterAnchorItem = 0;
+        vCenterAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::VCenterAnchor;
     }
     if (hCenterAnchorItem == item) {
-        hCenterAnchorItem = 0;
+        hCenterAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::HCenterAnchor;
     }
     if (baselineAnchorItem == item) {
-        baselineAnchorItem = 0;
+        baselineAnchorItem = nullptr;
         usedAnchors &= ~QQuickAnchors::BaselineAnchor;
     }
 }
@@ -462,7 +462,7 @@ void QQuickAnchorsPrivate::updateOnComplete()
 
     std::sort(dependencies, dependencies + 9);
 
-    QQuickItem *lastDependency = 0;
+    QQuickItem *lastDependency = nullptr;
     for (int i = 0; i < 9; ++i) {
         QQuickItem *dependency = dependencies[i];
         if (lastDependency != dependency) {
@@ -542,7 +542,7 @@ void QQuickAnchors::setFill(QQuickItem *f)
 
 void QQuickAnchors::resetFill()
 {
-    setFill(0);
+    setFill(nullptr);
 }
 
 QQuickItem *QQuickAnchors::centerIn() const
@@ -578,7 +578,7 @@ void QQuickAnchors::setCenterIn(QQuickItem* c)
 
 void QQuickAnchors::resetCenterIn()
 {
-    setCenterIn(0);
+    setCenterIn(nullptr);
 }
 
 bool QQuickAnchorsPrivate::calcStretch(QQuickItem *edge1Item,
@@ -1324,6 +1324,19 @@ QQuickAnchors::Anchors QQuickAnchors::usedAnchors() const
     return static_cast<QQuickAnchors::Anchors>(d->usedAnchors);
 }
 
+Qt::Orientations QQuickAnchors::activeDirections() const
+{
+    Q_D(const QQuickAnchors);
+    if (d->fill || d->centerIn)
+        return Qt::Horizontal | Qt::Vertical;
+    Qt::Orientations o;
+    if (d->usedAnchors & QQuickAnchors::Horizontal_Mask)
+        o |= Qt::Horizontal;
+    if (d->usedAnchors & QQuickAnchors::Vertical_Mask)
+        o |= Qt::Vertical;
+    return o;
+}
+
 bool QQuickAnchorsPrivate::checkHValid() const
 {
     if (usedAnchors & QQuickAnchors::LeftAnchor &&