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
..
ipc	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
json	Unify license header usage.	2016-03-29 10:20:03 +00:00
mimetypes	add missing install target	2016-05-19 17:49:19 +00:00
threads	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
corelib.pro	Add mime type browser example.	2016-03-24 13:03:02 +00:00