diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:13:08 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:14:27 (GMT) |
| commit | 7c8980ee041e874a6c430f01b2daff4955517b03 (patch) | |
| tree | aa19249a7fb469176fb22adfa9a1b702ae3be6c0 /demos/browser | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
| parent | a05f73499a187c67a394893e2cc74516ccbc46f5 (diff) | |
| download | Qt-7c8980ee041e874a6c430f01b2daff4955517b03.zip Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.gz Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
Diffstat (limited to 'demos/browser')
| -rw-r--r-- | demos/browser/networkaccessmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp index c63c0eb..38e8183 100644 --- a/demos/browser/networkaccessmanager.cpp +++ b/demos/browser/networkaccessmanager.cpp @@ -192,7 +192,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error) { // check if SSL certificate has been trusted already - QString replyHost = reply->url().host() + ":" + reply->url().port(); + QString replyHost = reply->url().host() + QString(":%1").arg(reply->url().port()); if(! sslTrustedHostList.contains(replyHost)) { BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow(); |