Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62		2015-06-03 10:23:56 +02:00
..
certs	ssl: add test for server-side QSslSocket::PeerVerifyMode	2015-02-07 06:51:05 +00:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	Blacklist one tst_qsslsocket test	2014-11-26 10:47:08 +01:00
qsslsocket.pro	Remove the tests for Ubuntu Oneiric (11.10)	2015-03-17 01:26:13 +00:00
ssl.tar.gz	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qsslsocket.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00