diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-04-23 14:28:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-24 06:09:25 +0200 |
| commit | 892eab1c409a7e4780fd79d8fe0f29c2f1c2ea62 (patch) | |
| tree | bec50d5e79e710fbb93f632178746a384782159c | |
| parent | bcb42c4001210db587cba180df51e735592ea5e9 (diff) | |
| parent | b91b9dfd0119306423cfc056b64c214681740ab6 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
| -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); |