Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01:00
..
qdbusabstractadaptor	Autotest: Fix a race condition in launching the QtDBus sub-processes	2014-12-20 07:37:17 +01:00
qdbusabstractinterface	Autotest: Fix a race condition in launching the QtDBus sub-processes	2014-12-20 07:37:17 +01:00
qdbusconnection	Remove the hardcoding of Unix socket paths for QtDBus	2014-12-20 07:36:42 +01:00
qdbusconnection_no_bus	tst_qdbusconnection_no_bus: Fix build on Windows	2014-12-20 07:36:34 +01:00
qdbuscontext	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusinterface	Autotest: Fix a race condition in launching the QtDBus sub-processes	2014-12-20 07:37:17 +01:00
qdbuslocalcalls	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusmarshall	Autotest: Fix a race condition in launching the QtDBus sub-processes	2014-12-20 07:37:17 +01:00
qdbusmetaobject	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusmetatype	Fix DBus signature generation for complex types.	2014-12-04 05:40:30 +01:00
qdbuspendingcall	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbuspendingreply	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusreply	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusservicewatcher	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusthreading	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbustype	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusxmlparser	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
dbus.pro	Revert c3f485c525	2013-08-08 09:22:29 +02:00