Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
platformsocketengine.pri	fix usage of wince scope	2015-06-05 10:29:10 +00:00
platformsocketengine.pro	QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2014-02-25 16:47:13 +01:00
tst_platformsocketengine.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00