Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	tests/auto/popup/tst_popup.cpp

Change-Id: I32e6c6b646a00f8805cb82d181417db60a6fe6c8

9 files changed, 192 insertions, 16 deletions

diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
index 409232b2..ab5ee1f3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
@@ -55,7 +55,7 @@ SpinBox {
         height: parent.height
         implicitWidth: 40
         implicitHeight: 40
-        color: up.pressed ? "#e4e4e4" : "#f6f6f6"
+        color: control.up.pressed ? "#e4e4e4" : "#f6f6f6"
         border.color: enabled ? "#21be2b" : "#bdbebf"
 
         Text {
@@ -74,7 +74,7 @@ SpinBox {
         height: parent.height
         implicitWidth: 40
         implicitHeight: 40
-        color: down.pressed ? "#e4e4e4" : "#f6f6f6"
+        color: control.down.pressed ? "#e4e4e4" : "#f6f6f6"
         border.color: enabled ? "#21be2b" : "#bdbebf"
 
         Text {
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index ed3d3d45..38f7949e 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -109,10 +109,9 @@ QVector<QQuickDrawer *> QQuickOverlayPrivate::stackingOrderDrawers() const
     return sorted;
 }
 
-void QQuickOverlayPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange, const QRectF &)
+void QQuickOverlayPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &)
 {
-    Q_Q(QQuickOverlay);
-    q->setSize(QSizeF(item->width(), item->height()));
+    updateGeometry();
 }
 
 QQuickOverlayPrivate::QQuickOverlayPrivate()
@@ -282,6 +281,43 @@ void QQuickOverlayPrivate::setMouseGrabberPopup(QQuickPopup *popup)
     mouseGrabberPopup = popup;
 }
 
+void QQuickOverlayPrivate::updateGeometry()
+{
+    Q_Q(QQuickOverlay);
+    if (!window)
+        return;
+
+    QPointF pos;
+    QSizeF size = window->size();
+    qreal rotation = 0;
+
+    switch (window->contentOrientation()) {
+    case Qt::PrimaryOrientation:
+    case Qt::PortraitOrientation:
+        size = window->size();
+        break;
+    case Qt::LandscapeOrientation:
+        rotation = 90;
+        pos = QPointF((size.width() - size.height()) / 2, -(size.width() - size.height()) / 2);
+        size.transpose();
+        break;
+    case Qt::InvertedPortraitOrientation:
+        rotation = 180;
+        break;
+    case Qt::InvertedLandscapeOrientation:
+        rotation = 270;
+        pos = QPointF((size.width() - size.height()) / 2, -(size.width() - size.height()) / 2);
+        size.transpose();
+        break;
+    default:
+        break;
+    }
+
+    q->setSize(size);
+    q->setPosition(pos);
+    q->setRotation(rotation);
+}
+
 QQuickOverlay::QQuickOverlay(QQuickItem *parent)
     : QQuickItem(*(new QQuickOverlayPrivate), parent)
 {
@@ -292,10 +328,12 @@ QQuickOverlay::QQuickOverlay(QQuickItem *parent)
     setVisible(false);
 
     if (parent) {
-        setSize(QSizeF(parent->width(), parent->height()));
+        d->updateGeometry();
         QQuickItemPrivate::get(parent)->addItemChangeListener(d, QQuickItemPrivate::Geometry);
-        if (QQuickWindow *window = parent->window())
+        if (QQuickWindow *window = parent->window()) {
             window->installEventFilter(this);
+            QObjectPrivate::connect(window, &QWindow::contentOrientationChanged, d, &QQuickOverlayPrivate::updateGeometry);
+        }
     }
 }
 
diff --git a/src/quicktemplates2/qquickoverlay_p_p.h b/src/quicktemplates2/qquickoverlay_p_p.h
index 772b9b09..a290ecc2 100644
--- a/src/quicktemplates2/qquickoverlay_p_p.h
+++ b/src/quicktemplates2/qquickoverlay_p_p.h
@@ -89,6 +89,8 @@ public:
 
     void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override;
 
+    void updateGeometry();
+
     QQmlComponent *modal;
     QQmlComponent *modeless;
     QVector<QQuickPopup *> allPopups;
diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp
index a8e217f1..2b67c85e 100644
--- a/src/quicktemplates2/qquickpopuppositioner.cpp
+++ b/src/quicktemplates2/qquickpopuppositioner.cpp
@@ -116,25 +116,27 @@ void QQuickPopupPositioner::reposition()
                 !p->hasWidth && iw > 0 ? iw : w,
                 !p->hasHeight && ih > 0 ? ih : h);
     if (m_parentItem) {
-        rect = m_parentItem->mapRectToScene(rect);
+        rect.moveTopLeft(m_parentItem->mapToItem(popupItem->parentItem(), rect.topLeft()));
 
         if (p->window) {
             const QMarginsF margins = p->getMargins();
-            const QRectF bounds(qMax<qreal>(0.0, margins.left()),
-                                qMax<qreal>(0.0, margins.top()),
-                                p->window->width() - qMax<qreal>(0.0, margins.left()) - qMax<qreal>(0.0, margins.right()),
-                                p->window->height() - qMax<qreal>(0.0, margins.top()) - qMax<qreal>(0.0, margins.bottom()));
+            QRectF bounds(qMax<qreal>(0.0, margins.left()),
+                          qMax<qreal>(0.0, margins.top()),
+                          p->window->width() - qMax<qreal>(0.0, margins.left()) - qMax<qreal>(0.0, margins.right()),
+                          p->window->height() - qMax<qreal>(0.0, margins.top()) - qMax<qreal>(0.0, margins.bottom()));
+            if (p->window->contentOrientation() == Qt::LandscapeOrientation || p->window->contentOrientation() == Qt::InvertedLandscapeOrientation)
+                bounds = bounds.transposed();
 
             // if the popup doesn't fit horizontally inside the window, try flipping it around (left <-> right)
             if (p->allowHorizontalFlip && (rect.left() < bounds.left() || rect.right() > bounds.right())) {
-                const QRectF flipped = m_parentItem->mapRectToScene(QRectF(m_parentItem->width() - p->x - rect.width(), p->y, rect.width(), rect.height()));
+                const QRectF flipped(m_parentItem->mapToScene(QPointF(m_parentItem->width() - p->x - rect.width(), p->y)), rect.size());
                 if (flipped.intersected(bounds).width() > rect.intersected(bounds).width())
                     rect.moveLeft(flipped.left());
             }
 
             // if the popup doesn't fit vertically inside the window, try flipping it around (above <-> below)
             if (p->allowVerticalFlip && (rect.top() < bounds.top() || rect.bottom() > bounds.bottom())) {
-                const QRectF flipped = m_parentItem->mapRectToScene(QRectF(p->x, m_parentItem->height() - p->y - rect.height(), rect.width(), rect.height()));
+                const QRectF flipped(m_parentItem->mapToScene(QPointF(p->x, m_parentItem->height() - p->y - rect.height())), rect.size());
                 if (flipped.intersected(bounds).height() > rect.intersected(bounds).height())
                     rect.moveTop(flipped.top());
             }
diff --git a/src/quicktemplates2/qquickstackelement.cpp b/src/quicktemplates2/qquickstackelement.cpp
index a3bb840e..887d43af 100644
--- a/src/quicktemplates2/qquickstackelement.cpp
+++ b/src/quicktemplates2/qquickstackelement.cpp
@@ -130,6 +130,9 @@ QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickSta
         return nullptr;
     }
 
+    if (url.isRelative())
+        url = qmlContext(view)->resolvedUrl(url);
+
     QQuickStackElement *element = new QQuickStackElement;
     element->component = new QQmlComponent(qmlEngine(view), url, view);
     element->ownComponent = true;
diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp
index f4405246..0167ad97 100644
--- a/src/quicktemplates2/qquickstackview_p.cpp
+++ b/src/quicktemplates2/qquickstackview_p.cpp
@@ -278,9 +278,13 @@ void QQuickStackViewPrivate::viewItemTransitionFinished(QQuickItemViewTransition
     }
 
     if (transitioner->runningJobs.isEmpty()) {
-        qDeleteAll(removed);
-        removed.clear();
+        // ~QQuickStackElement() emits QQuickStackViewAttached::removed(), which may be used
+        // to modify the stack. Set the status first and make a copy of the destroyable stack
+        // elements to exclude any modifications that may happen during the loop. (QTBUG-62153)
         setBusy(false);
+        QList<QQuickStackElement*> elements = removed;
+        removed.clear();
+        qDeleteAll(elements);
     }
 
     removing.remove(element);
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index 097180b8..f4b7fc4a 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -786,6 +786,19 @@ TestCase {
         compare(control.busy, false)
     }
 
+    function test_pushOnRemoved() {
+        var control = createTemporaryObject(stackView, testCase, { initialItem: component })
+        verify(control)
+
+        var item = control.push(component, StackView.Immediate)
+        verify(item)
+
+        item.StackView.onRemoved.connect(function() { control.push(component, StackView.Immediate) } )
+
+        // don't crash (QTBUG-62153)
+        control.pop(StackView.Immediate)
+    }
+
     Component {
         id: attachedItem
         Item {
@@ -1170,6 +1183,12 @@ TestCase {
         compare(item1.StackView.visible, true)
     }
 
+    function test_resolveInitialItem() {
+        var control = createTemporaryObject(stackView, testCase, {initialItem: "TestItem.qml"})
+        verify(control)
+        verify(control.currentItem)
+    }
+
     function test_resolve() {
         var control = createTemporaryObject(stackView, testCase)
         verify(control)
diff --git a/tests/auto/popup/data/orientation.qml b/tests/auto/popup/data/orientation.qml
new file mode 100644
index 00000000..cbf69b2b
--- /dev/null
+++ b/tests/auto/popup/data/orientation.qml
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.0
+
+Window {
+    width: 600
+    height: 300
+
+    property alias popup: popup
+
+    Rectangle {
+        width: 60
+        height: 30
+        anchors.centerIn: parent
+        border.width: 1
+
+        Popup {
+            id: popup
+            x: parent.width
+            y: parent.height
+            width: 30
+            height: 60
+            visible: true
+        }
+    }
+}
diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/popup/tst_popup.cpp
index 16cdcbef..184fe3c3 100644
--- a/tests/auto/popup/tst_popup.cpp
+++ b/tests/auto/popup/tst_popup.cpp
@@ -80,6 +80,8 @@ private slots:
     void componentComplete();
     void closeOnEscapeWithNestedPopups();
     void enabled();
+    void orientation_data();
+    void orientation();
 };
 
 void tst_popup::initTestCase()
@@ -1004,6 +1006,36 @@ void tst_popup::enabled()
     QCOMPARE(enabledSpy.count(), 2);
 }
 
+void tst_popup::orientation_data()
+{
+    QTest::addColumn<Qt::ScreenOrientation>("orientation");
+    QTest::addColumn<QPointF>("position");
+
+    QTest::newRow("Portrait") << Qt::PortraitOrientation << QPointF(330, 165);
+    QTest::newRow("Landscape") << Qt::LandscapeOrientation << QPointF(165, 270);
+    QTest::newRow("InvertedPortrait") << Qt::InvertedPortraitOrientation << QPointF(270, 135);
+    QTest::newRow("InvertedLandscape") << Qt::InvertedLandscapeOrientation << QPointF(135, 330);
+}
+
+void tst_popup::orientation()
+{
+    QFETCH(Qt::ScreenOrientation, orientation);
+    QFETCH(QPointF, position);
+
+    QQuickApplicationHelper helper(this, "orientation.qml");
+
+    QQuickWindow *window = helper.window;
+    window->reportContentOrientationChange(orientation);
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickPopup *popup = window->property("popup").value<QQuickPopup*>();
+    QVERIFY(popup);
+    popup->open();
+
+    QCOMPARE(popup->popupItem()->position(), position);
+}
+
 QTEST_MAIN(tst_popup)
 
 #include "tst_popup.moc"