Liang Qi 56d6e000f7 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: mkspecs/wince80colibri-armv7-msvc2012/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/tools/tools.pri src/network/ssl/qsslconfiguration_p.h src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/plugins/platforms/windows/windows.pri src/src.pro src/tools/bootstrap/bootstrap.pro src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/dialogs/qfilesystemmodel.cpp tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5		2016-05-23 21:09:46 +02:00
..
access	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-03 15:49:15 +02:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
socket	Revert "tst_qudpsocket - remove insignificant"	2016-05-13 19:07:56 +00:00
ssl	Add support for PSK on server side	2016-05-02 20:33:00 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00