Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62		2015-06-03 10:23:56 +02:00
..
image	Optionally apply orientation on QImage read	2015-05-12 09:25:11 +00:00
itemmodels	QStandardItem: add user-tristate and auto-tristate getters/setters	2015-05-07 09:50:59 +00:00
kernel	Stabilize tst_qtouchevent.	2015-06-01 13:39:13 +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-27 21:36:32 +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	Fix users of QTextLayout::additionalFormats to use the new API	2015-05-30 10:56:24 +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