AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49ea02f435
qt5base-lts/tests/auto/dbus
History
Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
2015-08-06 10:54:01 +02:00
..
qdbusabstractadaptor Merge remote-tracking branch 'origin/5.5' into dev 2015-08-06 10:54:01 +02:00
qdbusabstractinterface Autotest: rename sub tests from "test" to something meaningful 2015-07-18 02:22:40 +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 Autotest: rename sub tests from "test" to something meaningful 2015-07-18 02:22:40 +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-08-06 10:54:01 +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