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
..
image	Cleanup and optimization of qimage smoothscale	2015-04-15 11:25:41 +00:00
itemmodels	Update copyright headers	2015-02-11 06:49:51 +00:00
kernel	Enable checking for whether the system palette was explicitly set	2015-04-20 06:39:31 +00:00
math3d	Introduce QQuaternion::fromDirection()	2015-04-07 13:07:48 +00:00
painting	Merge remote-tracking branch 'origin/5.5' into dev	2015-04-22 09:25:54 +02:00
qopengl	Update copyright headers	2015-02-11 06:49:51 +00:00
qopenglconfig	Add matching by GL_VENDOR to QOpenGLConfig	2015-04-16 16:47:43 +00:00
text	QString: preserve embedded NULs when converting from QByteArray	2015-04-02 19:28:31 +00:00
util	Update copyright headers	2015-02-11 06:49:51 +00:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00