diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
| commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
| tree | 7f9e3b14a2456cc779aa165457192094507dd257 /tests/auto/network/access/qnetworkreply | |
| parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
| parent | 84569773db68408704193268bc42a200bb25a924 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'tests/auto/network/access/qnetworkreply')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST index 7792e05e0f..84ccb49e58 100644 --- a/tests/auto/network/access/qnetworkreply/BLACKLIST +++ b/tests/auto/network/access/qnetworkreply/BLACKLIST @@ -2,6 +2,8 @@ osx [ioGetFromBuiltinHttp:https+limited] osx +[ioGetFromHttpBrokenServer:no-newline] +osx [synchronousRequest:https] osx [SslHandshakeFailedError] diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 533f7a7289..7afffff00b 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -7290,7 +7290,7 @@ void tst_QNetworkReply::synchronousRequest() // workaround for HTTPS requests: add self-signed server cert to list of CA certs, // since we cannot react to the sslErrors() signal // to fix this properly we would need to have an ignoreSslErrors() method in the - // QNetworkRequest, see http://bugreports.qt-project.org/browse/QTBUG-14774 + // QNetworkRequest, see QTBUG-14774 if (url.scheme() == "https") { QSslConfiguration sslConf; QList<QSslCertificate> certs = QSslCertificate::fromPath(testDataDir + "/certs/qt-test-server-cacert.pem"); |