Liang Qi d0eaa737e1 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/tools/qstring.h src/gui/image/qimagereader.cpp src/network/access/qnetworkaccessmanager.cpp src/tools/qdoc/doc/examples/examples.qdoc src/widgets/accessible/qaccessiblewidgetfactory_p.h src/widgets/doc/qtwidgets.qdocconf Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb		2015-10-02 16:59:55 +02:00
..
.gitignore
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qsocketnotifier.pro	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
tst_qsocketnotifier.cpp	Fix the spurious socket notifications under Windows	2015-09-10 12:51:02 +00:00