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

Change-Id: I20d3fc9664dcd908d01a78e5765628433f510bc3

3 files changed, 16 insertions, 16 deletions

diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index 32e85b9..8cbaa71 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -387,6 +387,8 @@ void QRemoteObjectNode::registerExternalSchema(const QString &schema, QRemoteObj
     configured with the provided address. If no \a hostUrl is provided, the
     internal node will be a QRemoteObjectNode (not HostNode).
 
+    Returns \c true if the object is acquired from the internal node.
+
     \sa reverseProxy()
 */
 bool QRemoteObjectHostBase::proxy(const QUrl &registryUrl, const QUrl &hostUrl, RemoteObjectNameFilter filter)
@@ -469,8 +471,8 @@ bool QRemoteObjectHostBase::proxy(const QUrl &registryUrl, const QUrl &hostUrl,
     network to be acquired(), reverseProxy() allows \l Source objects to be
     "pushed" to an otherwise inaccessible network.
 
-    Note: \l proxy() needs to be called before \l reverseProxy(), and a
-    \a hostUrl needs to be provided to \l proxy for \l reverseProxy() to work. The
+    \note proxy() needs to be called before \l reverseProxy(), and a
+    hostUrl needs to be provided to \l proxy for \l reverseProxy() to work. The
     \l reverseProxy() method allows a separate \a filter to be applied. This
     reverseProxy specific filter will receive notifications of new \l Source
     objects on proxyNode and acquire them on the internal node if they pass the
@@ -1647,9 +1649,9 @@ QRemoteObjectHostBase::QRemoteObjectHostBase(QRemoteObjectHostBasePrivate &d, QO
     Constructs a new QRemoteObjectHost Node (i.e., a Node that supports
     exposing \l Source objects on the QtRO network) with the given \a parent.
     This constructor is meant specific to support QML in the future as it will
-    not be available to connect to until \l {QRemoteObjectHost::}{setHostUrl}() is called.
+    not be available to connect to until \l {QRemoteObjectHost::}{setHostUrl} is called.
 
-    \sa {QRemoteObjectHost::}{setHostUrl}(), setRegistryUrl()
+    \sa setHostUrl(), setRegistryUrl()
 */
 QRemoteObjectHost::QRemoteObjectHost(QObject *parent)
     : QRemoteObjectHostBase(*new QRemoteObjectHostPrivate, parent)
@@ -1665,7 +1667,7 @@ QRemoteObjectHost::QRemoteObjectHost(QObject *parent)
     {AllowExternalRegistration}) if the schema of the url should be used as an
     \l {External Schemas} {External Schema} by the registry.
 
-    \sa {QRemoteObjectHost::}{setHostUrl}(), setRegistryUrl()
+    \sa setHostUrl(), setRegistryUrl()
 */
 QRemoteObjectHost::QRemoteObjectHost(const QUrl &address, const QUrl &registryAddress,
                                      AllowedSchemas allowedSchemas, QObject *parent)
@@ -1815,7 +1817,7 @@ bool QRemoteObjectHostBase::setHostUrl(const QUrl &hostAddress, AllowedSchemas a
     Returns the host address for the QRemoteObjectNode as a QUrl. If the Node
     is not a Host node, it return an empty QUrl.
 
-    \sa {QRemoteObjectHost}{setHostUrl}()
+    \sa setHostUrl()
 */
 QUrl QRemoteObjectHost::hostUrl() const
 {
@@ -1845,6 +1847,8 @@ bool QRemoteObjectHost::setHostUrl(const QUrl &hostAddress, AllowedSchemas allow
     Node's use the \l {QRemoteObjectNode::setRegistryUrl} method initiate a
     connection to the Registry.
 
+    Returns \c true if the registry address is set, otherwise \c false.
+
     \sa QRemoteObjectRegistryHost(), QRemoteObjectNode::setRegistryUrl
 */
 bool QRemoteObjectRegistryHost::setRegistryUrl(const QUrl &registryUrl)
@@ -2088,7 +2092,7 @@ void QRemoteObjectNode::addClientSideConnection(QIODevice *ioDevice)
     loc parameter contains the information about the added Source, including
     name, type and the QUrl of the hosting Node.
 
-    \sa remoteObjectRemoved, instances
+    \sa remoteObjectRemoved(), instances()
 */
 
 /*!
@@ -2259,8 +2263,9 @@ bool QRemoteObjectHostBase::enableRemoting(QAbstractItemModel *model, const QStr
 */
 
 /*!
-    \internal Enables a host node to provide remote access to a QObject \a
-    object with the API defined by \a api. Client nodes connected to the node
+    \internal
+    Enables a host node to provide remote access to a QObject \a object
+    with the API defined by \a api. Client nodes connected to the node
     hosting this object may obtain Replicas of this Source.
 
     Returns \c false if the current node is a client node, or if the QObject is
diff --git a/tests/auto/integration/integration.pro b/tests/auto/integration/integration.pro
index 6428a97..f304014 100644
--- a/tests/auto/integration/integration.pro
+++ b/tests/auto/integration/integration.pro
@@ -1,8 +1,5 @@
 TARGET = tst_integration
 
-# QTBUG-61552
-boot2qt: DEFINES += SKIP_LOCAL
-
 OTHER_FILES = engine.rep \
               ../repfiles/localdatacenter.rep \
               ../repfiles/tcpdatacenter.rep
diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp
index 7f39381..0718219 100644
--- a/tests/auto/integration/tst_integration.cpp
+++ b/tests/auto/integration/tst_integration.cpp
@@ -214,9 +214,7 @@ private slots:
 #ifdef __QNXNTO__
         QTest::newRow("qnx") << QUrl(QLatin1String("qnx:replica")) << QUrl(QLatin1String("qnx:registry"));
 #endif
-#ifndef SKIP_LOCAL
-        QTest::newRow("local") << QUrl(QLatin1String("local:replica_local_integration")) << QUrl(QLatin1String("local:registry_local_integration"));
-#endif
+        QTest::newRow("local") << QUrl(QLatin1String("local:replicaLocalIntegration")) << QUrl(QLatin1String("local:registryLocalIntegration"));
         QTest::newRow("external") << QUrl() << QUrl();
     }
 
@@ -1299,7 +1297,7 @@ private slots:
         QVERIFY(invalidRegistry.lastError() == QRemoteObjectNode::RegistryNotAcquired);
     }
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_DARWIN) && !defined(SKIP_LOCAL)
+#if defined(Q_OS_LINUX) || defined(Q_OS_DARWIN)
     void localServerConnectionTest()
     {
         QFETCH_GLOBAL(QUrl, hostUrl);