Merge remote-tracking branch 'origin/5.11' into 5.12.0

 Conflicts:
	src/imports/settings/qqmlsettings.cpp
	src/quick/items/qquickwindow.cpp
	tools/qmlplugindump/main.cpp

Change-Id: I3e5dae4de25b2da961a572b3a4bd151181d211c9

4 files changed, 181 insertions, 5 deletions

diff --git a/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp b/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp
index b353d23539..b0be799bd5 100644
--- a/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp
+++ b/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp
@@ -53,6 +53,7 @@ private slots:
     void categories();
     void siblings();
     void initial();
+    void noApplicationIdentifiersSet();
 };
 
 // ### Replace keyValueMap("foo", "bar") with QVariantMap({{"foo", "bar"}})
@@ -147,10 +148,6 @@ void tst_QQmlSettings::initTestCase()
 {
     QQmlDataTest::initTestCase();
 
-    QCoreApplication::setApplicationName("tst_QQmlSettings");
-    QCoreApplication::setOrganizationName("QtProject");
-    QCoreApplication::setOrganizationDomain("qt-project.org");
-
     qmlRegisterType<CppObject>("Qt.test", 1, 0, "CppObject");
 }
 
@@ -158,6 +155,10 @@ void tst_QQmlSettings::init()
 {
     QSettings settings;
     settings.clear();
+
+    QCoreApplication::setApplicationName("tst_QQmlSettings");
+    QCoreApplication::setOrganizationName("QtProject");
+    QCoreApplication::setOrganizationDomain("qt-project.org");
 }
 
 void tst_QQmlSettings::cleanup()
@@ -481,6 +482,31 @@ void tst_QQmlSettings::initial()
     QCOMPARE(settings->property("value").toString(), QStringLiteral("initial"));
 }
 
+void tst_QQmlSettings::noApplicationIdentifiersSet()
+{
+#ifdef Q_OS_MACOS
+    QSKIP("macOS doesn't complain about empty application identifiers");
+#endif
+
+    QCoreApplication::setApplicationName(QString());
+    QCoreApplication::setOrganizationName(QString());
+    QCoreApplication::setOrganizationDomain(QString());
+
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression(".*QML Settings: Failed to initialize QSettings instance. Status code is: 1"));
+    // Can't set an empty applicationName because QCoreApplication won't allow it, which is why it's not listed here.
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression(".*QML Settings: The following application identifiers have not been set: QVector\\(\"organizationName\", \"organizationDomain\"\\)"));
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("basic.qml"));
+    QScopedPointer<QObject> root(component.create());
+    QVERIFY(root.data());
+    // The value of the QML property will be true because it defaults to it...
+    QVERIFY(root->property("success").toBool());
+    QSettings settings;
+    // ... but the settings' value should be false because it was never loaded.
+    QVERIFY(!settings.value("success").toBool());
+}
+
 QTEST_MAIN(tst_QQmlSettings)
 
 #include "tst_qqmlsettings.moc"
diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
index 0ee78fae54..1bfeb94161 100644
--- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
@@ -42,9 +42,11 @@
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlproperty.h>
 #include <QtQuick/private/qquickaccessibleattached_p.h>
+#include <QtQuick/private/qquicklistview_p.h>
+#include <QtQuick/private/qquicktext_p.h>
 
 #include "../../shared/util.h"
-
+#include "../shared/visualtestutil.h"
 
 #define EXPECT(cond) \
     do { \
@@ -224,6 +226,72 @@ void tst_QQuickAccessible::quickAttachedProperties()
         }
         delete object;
     }
+
+    // Check overriding of attached role for Text
+    {
+        QQmlEngine engine;
+        QQmlComponent component(&engine);
+        component.setData("import QtQuick 2.0\nText {\n"
+                          "Accessible.role: Accessible.Button\n"
+                          "Accessible.name: \"TextButton\"\n"
+                          "Accessible.description: \"Text Button\"\n"
+                          "}", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != nullptr);
+
+        QObject *attachedObject = QQuickAccessibleAttached::attachedProperties(object);
+        QVERIFY(attachedObject);
+        if (attachedObject) {
+            QVariant p = attachedObject->property("role");
+            QCOMPARE(p.isNull(), false);
+            QCOMPARE(p.toInt(), int(QAccessible::PushButton));
+            p = attachedObject->property("name");
+            QCOMPARE(p.isNull(), false);
+            QCOMPARE(p.toString(), QLatin1String("TextButton"));
+            p = attachedObject->property("description");
+            QCOMPARE(p.isNull(), false);
+            QCOMPARE(p.toString(), QLatin1String("Text Button"));
+        }
+        delete object;
+    }
+    // Check overriding of attached role for Text
+    {
+        QQmlEngine engine;
+        QQmlComponent component(&engine);
+        component.setData("import QtQuick 2.0\nListView {\n"
+                          "id: list\n"
+                          "model: 5\n"
+                          "delegate: Text {\n"
+                          "objectName: \"acc_text\"\n"
+                          "Accessible.role: Accessible.Button\n"
+                          "Accessible.name: \"TextButton\"\n"
+                          "Accessible.description: \"Text Button\"\n"
+                          "}\n"
+                          "}", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != nullptr);
+
+        QQuickListView *listview = qobject_cast<QQuickListView *>(object);
+        QVERIFY(listview != nullptr);
+        QQuickItem *contentItem = listview->contentItem();
+        QQuickText *childItem = QQuickVisualTestUtil::findItem<QQuickText>(contentItem, "acc_text");
+        QVERIFY(childItem != nullptr);
+
+        QObject *attachedObject = QQuickAccessibleAttached::attachedProperties(childItem);
+        QVERIFY(attachedObject);
+        if (attachedObject) {
+            QVariant p = attachedObject->property("role");
+            QCOMPARE(p.isNull(), false);
+            QCOMPARE(p.toInt(), int(QAccessible::PushButton));
+            p = attachedObject->property("name");
+            QCOMPARE(p.isNull(), false);
+            QCOMPARE(p.toString(), QLatin1String("TextButton"));
+            p = attachedObject->property("description");
+            QCOMPARE(p.isNull(), false);
+            QCOMPARE(p.toString(), QLatin1String("Text Button"));
+        }
+        delete object;
+    }
     QTestAccessibility::clearEvents();
 }
 
diff --git a/tests/auto/quick/qquickmousearea/data/nestedSendEvent.qml b/tests/auto/quick/qquickmousearea/data/nestedSendEvent.qml
new file mode 100644
index 0000000000..908a43b04e
--- /dev/null
+++ b/tests/auto/quick/qquickmousearea/data/nestedSendEvent.qml
@@ -0,0 +1,49 @@
+import QtQuick 2.11
+import QtQuick.Window 2.11
+import Test 1.0
+
+Window {
+    id: window
+    visible: true
+    width: 200
+    height: 200
+
+    property EventSender sender: EventSender { }
+
+    Item {
+        width: 200
+        height: 200
+
+        MouseArea {
+            anchors.fill: parent
+        }
+
+        Item {
+            width: 200
+            height: 200
+
+            Rectangle {
+                width: 200
+                height: 100
+                color: "red"
+
+                MouseArea {
+                    anchors.fill: parent
+                    onPressed: sender.sendMouseClick(window, 50, 50)
+                }
+            }
+
+            Rectangle {
+                y: 100
+                width: 200
+                height: 100
+                color: "yellow"
+
+                MouseArea {
+                    anchors.fill: parent
+                    onPressed: sender.sendMouseClick(window, 50, 50)
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index aa379e834e..558ca2e759 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -98,6 +98,22 @@ private:
     qreal m_radius;
 };
 
+class EventSender : public QObject {
+    Q_OBJECT
+
+public:
+    Q_INVOKABLE void sendMouseClick(QObject* obj ,qreal x , qreal y) {
+        {
+            QMouseEvent event(QEvent::MouseButtonPress, QPointF(x , y), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+            qApp->sendEvent(obj, &event);
+        }
+        {
+            QMouseEvent event(QEvent::MouseButtonRelease, QPointF(x , y), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+            qApp->sendEvent(obj, &event);
+        }
+    }
+};
+
 class tst_QQuickMouseArea: public QQmlDataTest
 {
     Q_OBJECT
@@ -106,6 +122,7 @@ public:
         : device(nullptr)
     {
         qmlRegisterType<CircleMask>("Test", 1, 0, "CircleMask");
+        qmlRegisterType<EventSender>("Test", 1, 0, "EventSender");
     }
 
 private slots:
@@ -165,6 +182,7 @@ private slots:
     void pressOneAndTapAnother_data();
     void pressOneAndTapAnother();
     void mask();
+    void nestedEventDelivery();
 
 private:
     int startDragDistance() const {
@@ -2298,6 +2316,21 @@ void tst_QQuickMouseArea::mask()
     QCOMPARE(window.rootObject()->property("clicked").toInt(), 1);
 }
 
+void tst_QQuickMouseArea::nestedEventDelivery() // QTBUG-70898
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("nestedSendEvent.qml"));
+    QScopedPointer<QQuickWindow> window(qmlobject_cast<QQuickWindow *>(c.create()));
+    QVERIFY(window.data());
+
+    // Click each MouseArea and verify that it doesn't crash
+    QByteArray message = "event went missing during delivery! (nested sendEvent() is not allowed)";
+    QTest::ignoreMessage(QtWarningMsg, message);
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(50,50));
+    QTest::ignoreMessage(QtWarningMsg, message); // twice though, actually
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(50,150));
+}
+
 QTEST_MAIN(tst_QQuickMouseArea)
 
 #include "tst_qquickmousearea.moc"