Simon Hausmann 198606f6db Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/plugins/platforms/xcb/qxcbnativeinterface.cpp src/plugins/platforms/xcb/qxcbnativeinterface.h Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076		2015-03-16 10:31:07 +01:00
..
codecs	Update copyright headers	2015-02-11 06:49:51 +00:00
io	Update copyright headers	2015-02-11 06:49:51 +00:00
json	Update copyright headers	2015-02-11 06:49:51 +00:00
kernel	Update copyright headers	2015-02-11 06:49:51 +00:00
mimetypes	Update copyright headers	2015-02-11 06:49:51 +00:00
plugin	Update copyright headers	2015-02-11 06:49:51 +00:00
thread	Update copyright headers	2015-02-11 06:49:51 +00:00
tools	Merge remote-tracking branch 'origin/5.5' into dev	2015-03-16 10:31:07 +01:00
corelib.pro	test: Moving tst_QMimeDatabase::inheritsPerformance() test	2012-10-31 19:56:42 +01:00