Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01:00
..
dialogs	Enable tst_qfiledialog2 on OSX	2014-11-19 16:13:25 +01:00
effects	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
gestures	QPanGestureRecognizer: Make the number of touch points a parameter.	2014-11-17 14:38:15 +01:00
graphicsview	Fixed a bug where spans did not always work in layouts.	2014-12-09 16:58:58 +01:00
itemviews	Make the defaultSectionSize property of QHeaderView style dependent	2014-12-11 10:26:41 +01:00
kernel	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00
styles	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
util	Change bugreports.qt-project.org -> bugreports.qt.io	2014-12-18 09:46:09 +01:00
widgets	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00
widgets.pro	Add autotest for QGestureRecognizer.	2014-10-23 21:11:28 +02:00