AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a1ad9a74eb
qt5base-lts/tests/auto/dbus
History
Liang Qi a1ad9a74eb Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/io/io.pri
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/network/socket/qabstractsocket.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
	tests/auto/dbus/qdbusconnection/qdbusconnection.pro
	tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
2015-09-25 14:02:04 +02:00
..
qdbusabstractadaptor Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qdbusabstractinterface Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qdbusconnection Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qdbusconnection_no_app And move the creation of connections to the thread 2015-09-15 02:08:45 +00:00
qdbusconnection_no_bus Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbuscontext Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusinterface Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbuslocalcalls Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusmarshall Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusmetaobject Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusmetatype Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbuspendingcall Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qdbuspendingreply Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusreply Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusservicewatcher Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qdbusthreading Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbustype Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusxmlparser Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
dbus.pro And move the creation of connections to the thread 2015-09-15 02:08:45 +00:00