diff options
author | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:45:00 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:45:00 +0300 |
commit | b91b9dfd0119306423cfc056b64c214681740ab6 (patch) | |
tree | a19f76e97e52e10cc7f6d10cbed68fa97ea15421 | |
parent | da39c3b555688fc868fc886452c1e78c8c41a430 (diff) | |
parent | c7531f6530d36019c00b08e57e9c9181cabc6b77 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I4b9ced111eae96d6064be237d80e5038888100dd
-rw-r--r-- | src/enginio_client/enginioclient.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/enginio_client/enginioclient.cpp b/src/enginio_client/enginioclient.cpp index 3fe1536..68a46fb 100644 --- a/src/enginio_client/enginioclient.cpp +++ b/src/enginio_client/enginioclient.cpp @@ -416,19 +416,13 @@ void EnginioClientConnection::setBackendId(const QByteArray &backendId) /*! \property EnginioClientConnection::serviceUrl \brief Enginio backend URL. - \internal The API URL determines the server used by Enginio. - Usually it is not needed to change the default URL. -*/ - -/*! - \fn EnginioClientConnection::serviceUrlChanged(const QUrl &url) - \internal -*/ -/*! - \internal + Usually it is not needed to change the default URL, but if it has + to be changed it should be done as a first operaion on this + EnginioClientConnection, otherwise some request may be sent accidentally + to the default url. */ QUrl EnginioClientConnection::serviceUrl() const { @@ -436,9 +430,6 @@ QUrl EnginioClientConnection::serviceUrl() const return d->_serviceUrl; } -/*! - \internal -*/ void EnginioClientConnection::setServiceUrl(const QUrl &serviceUrl) { Q_D(EnginioClientConnection); |