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
..
qdbusmarshall	Autotest: rename sub tests from "test" to something meaningful	2015-07-18 02:22:40 +00:00
qpong	Update copyright headers	2015-02-11 06:49:51 +00:00
.gitignore	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
common.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qdbusmarshall.pro	Autotest: rename sub tests from "test" to something meaningful	2015-07-18 02:22:40 +00:00
tst_qdbusmarshall.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00