Liang Qi aed5a71683 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/gui/painting/qdrawhelper.cpp src/plugins/platforms/xcb/qxcbnativeinterface.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/plugins/platforms/xcb/qxcbwindow.h src/testlib/qtestblacklist.cpp src/tools/qdoc/node.cpp src/tools/qdoc/node.h tests/auto/gui/painting/qcolor/tst_qcolor.cpp Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684		2015-04-22 09:25:54 +02:00
..
animation	Update copyright headers	2015-02-11 06:49:51 +00:00
codecs	Fix support for iso8859-16 when compiling with ICU	2015-03-18 07:34:55 +00:00
global	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
io	Merge remote-tracking branch 'origin/5.5' into dev	2015-04-22 09:25:54 +02:00
itemmodels	Update copyright headers	2015-02-11 06:49:51 +00:00
json	Make sure remove() doesn't corrupt the json object	2015-03-18 07:34:59 +00:00
kernel	Merge remote-tracking branch 'origin/5.5' into dev	2015-04-22 09:25:54 +02:00
mimetypes	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
plugin	Merge remote-tracking branch 'origin/5.5' into dev	2015-04-06 19:10:25 +02:00
statemachine	QStateMachine: remove conflicting transitions after selection.	2015-04-10 12:59:52 +00:00
thread	Do not search test binary if QProcess is not supported.	2015-03-23 08:38:58 +00:00
tools	Add qHash(QVector)	2015-04-20 07:42:03 +00:00
xml	Update copyright headers	2015-02-11 06:49:51 +00:00
corelib.pro	…