Liang Qi b894a8def5 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/features/qml_module.prf mkspecs/features/qt_common.prf src/gui/text/qzip.cpp src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/windows/array.h src/testlib/qtestcase.cpp src/widgets/dialogs/qfilesystemmodel.h Change-Id: Ie41c5868415b81f7693c80e045497035504bb210		2016-04-29 17:55:20 +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-04-29 17:55:20 +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
qdbuscontext	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusinterface	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qdbuslocalcalls	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusmarshall	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00: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	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qdbusxmlparser	Updated license headers	2016-01-21 18:55:18 +00:00
dbus.pro	Autotest: test both libdbus-1 load failure and connection failure	2016-01-02 02:06:10 +00:00