From 47c6aa50d0423b6ccc40abdc16556d60d4fa9342 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 13 Aug 2019 14:06:29 +0300 Subject: Change address URL for local tests in tst_integration QUrl with address => 31 characters were failing because the socket connection was disconnecting while being used and causing a segfault. This re-enable tests affected to increase coverage, however, Another ticket for the root cause of this bug will be issued. Fixes: QTBUG-61552 Task-number: QTBUG-77462 Change-Id: I0fdba6a018e7cea85cef9de154ad80565f6d0601 Reviewed-by: Samuli Piippo --- tests/auto/integration/integration.pro | 3 --- tests/auto/integration/tst_integration.cpp | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) 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); -- cgit v1.2.3 From eb7e5a85ceed419bc93066b32cb8db7012ee8662 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 21 Feb 2019 16:02:51 +0100 Subject: Doc: Fix link errors Change-Id: Id8dc95cb1ff0a0fcdab1a926109e170e295cd69a Reviewed-by: Paul Wicking --- src/remoteobjects/qremoteobjectnode.cpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp index 9eec443..482de0f 100644 --- a/src/remoteobjects/qremoteobjectnode.cpp +++ b/src/remoteobjects/qremoteobjectnode.cpp @@ -383,6 +383,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 ®istryUrl, const QUrl &hostUrl, RemoteObjectNameFilter filter) @@ -465,8 +467,8 @@ bool QRemoteObjectHostBase::proxy(const QUrl ®istryUrl, 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 @@ -1643,9 +1645,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) @@ -1661,7 +1663,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 ®istryAddress, AllowedSchemas allowedSchemas, QObject *parent) @@ -1811,7 +1813,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 { @@ -1841,6 +1843,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 ®istryUrl) @@ -2084,7 +2088,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() */ /*! @@ -2255,8 +2259,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 -- cgit v1.2.3