Gunnar Sletta a9ac6da893 Merge branch 'master' into refactor ... Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe		2011-09-12 07:49:03 +02:00
..
qdbusabstractadaptor	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusabstractinterface	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusconnection	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusconnection_no_bus	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbuscontext	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusinterface	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbuslocalcalls	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusmarshall	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusmetaobject	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusmetatype	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbuspendingcall	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbuspendingreply	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusreply	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusservicewatcher	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusthreading	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbustype	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
qdbusxmlparser	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
dbus.pro	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00