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
..
qdbusabstractadaptor	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qdbusabstractinterface	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qdbusconnection	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qdbusconnection_delayed	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusconnection_no_app	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusconnection_no_bus	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusconnection_no_libdbus	Autotest: rename the test class so it's different in this test	2016-01-30 03:20:54 +00:00
qdbusconnection_spyhook	Add an autotest for the QtDBus message spy hook	2016-05-09 05:31:11 +00:00
qdbuscontext	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusinterface	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qdbuslocalcalls	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusmarshall	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
qdbusmetaobject	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusmetatype	Updated license headers	2016-01-21 18:55:18 +00:00
qdbuspendingcall	Updated license headers	2016-01-21 18:55:18 +00:00
qdbuspendingreply	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusreply	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusservicewatcher	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qdbusthreading	Updated license headers	2016-01-21 18:55:18 +00:00
qdbustype	Unify naming of LIBS/CFLAGS for 3rd party libraries	2016-04-07 16:18:03 +00:00
qdbusxmlparser	Updated license headers	2016-01-21 18:55:18 +00:00
dbus.pro	Add an autotest for the QtDBus message spy hook	2016-05-09 05:31:11 +00:00