Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +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	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
itemviews	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
kernel	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
styles	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
util	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
widgets	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
widgets.pro	Add autotest for QGestureRecognizer.	2014-10-23 21:11:28 +02:00