qt5base-lts/tests/auto/dbus
Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
2015-06-03 10:23:56 +02:00
..
qdbusabstractadaptor Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusabstractinterface Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusconnection Merge remote-tracking branch 'origin/5.5' into dev 2015-04-01 09:10:26 +02:00
qdbusconnection_no_bus Update copyright headers 2015-02-11 06:49:51 +00:00
qdbuscontext Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusinterface Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbuslocalcalls Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusmarshall Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
qdbusmetaobject Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusmetatype Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbuspendingcall Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbuspendingreply Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusreply Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusservicewatcher Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbusthreading Tests: remove insignificant flag for dbus tests on osx 2015-03-27 18:37:30 +00:00
qdbustype Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00
qdbusxmlparser Update copyright headers 2015-02-11 06:49:51 +00:00
dbus.pro Revert c3f485c525 2013-08-08 09:22:29 +02:00