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

Change-Id: Ia8536328b6ea1c25923e40b473be54045375d31f

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/auto/proxy/tst_proxy.cpp b/tests/auto/proxy/tst_proxy.cpp
index 0148fca..8022063 100644
--- a/tests/auto/proxy/tst_proxy.cpp
+++ b/tests/auto/proxy/tst_proxy.cpp
@@ -68,6 +68,8 @@ private Q_SLOTS:
         host.enableRemoting<ParentClassSourceAPI>(&parent);
     }
     */
+
+    void testTopLevelModel();
 };
 
 void ProxyTest::testProxy_data()
@@ -333,6 +335,35 @@ void ProxyTest::testProxy()
     replica.reset();
 }
 
+void ProxyTest::testTopLevelModel()
+{
+    QRemoteObjectRegistryHost registry(registryUrl);
+
+    //Setup Local Host
+    QRemoteObjectHost host(localHostUrl);
+    SET_NODE_NAME(host);
+    host.setRegistryUrl(registryUrl);
+
+    QStringListModel model;
+    model.setStringList(QStringList() << "Track1" << "Track2" << "Track3");
+    host.enableRemoting(&model, "trackList", QVector<int>() << Qt::DisplayRole);
+
+    QRemoteObjectHost proxyNode;
+    SET_NODE_NAME(proxyNode);
+    proxyNode.setHostUrl(tcpHostUrl);
+    proxyNode.proxy(registryUrl);
+
+    //Setup Local Replica
+    QRemoteObjectNode client;
+    SET_NODE_NAME(client);
+    client.connectToNode(tcpHostUrl);
+    QAbstractItemModelReplica *replica = client.acquireModel("trackList");
+    QSignalSpy tracksSpy(replica, &QAbstractItemModelReplica::initialized);
+    QVERIFY(tracksSpy.wait());
+    QTest::qWait(100);
+    QCOMPARE(replica->rowCount(), model.rowCount());
+}
+
 QTEST_MAIN(ProxyTest)
 
 #include "tst_proxy.moc"