diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:10 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:11 +0200 |
| commit | 464a43d43c2bb2440d4ad745bc134e0dac10872c (patch) | |
| tree | b1c27b1d1c11f9c43bd2e62e1fd955bc6f89029f /tests/auto/network/ssl/qsslsocket/BLACKLIST | |
| parent | 0208cac94fbd79fc563c903e2b973d79f9644b82 (diff) | |
| parent | 877ef0594d94f48bf063446b1f8a4b5e1941a8cd (diff) | |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: Id3fc911f024cba292a5c426b36aa94ff9f3c0ef7
Diffstat (limited to 'tests/auto/network/ssl/qsslsocket/BLACKLIST')
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket/BLACKLIST | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/BLACKLIST b/tests/auto/network/ssl/qsslsocket/BLACKLIST index cfab0b7eb0..52c023b78f 100644 --- a/tests/auto/network/ssl/qsslsocket/BLACKLIST +++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST @@ -5,5 +5,3 @@ windows rhel-7.2 [protocolServerSide:tls1.0-any] rhel-7.2 -[protocolServerSide] -osx-10.11 |