Frederik Gladhorn 98d3e40fb7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267		2014-04-11 14:36:55 +02:00
..
bearer	Merge remote-tracking branch 'origin/stable' into dev	2014-03-24 16:10:15 +01:00
generic	make cmake registration of qt plugins make use of PLUGIN_EXTENDS	2014-04-09 20:53:06 +02:00
imageformats	Doc: Adding mark-up to boolean default values.	2013-10-08 00:46:27 +02:00
platforminputcontexts	Merge remote-tracking branch 'origin/stable' into dev	2014-04-11 14:36:55 +02:00
platforms	Merge remote-tracking branch 'origin/stable' into dev	2014-04-11 14:36:55 +02:00
platformthemes	make cmake registration of qt plugins make use of PLUGIN_EXTENDS	2014-04-09 20:53:06 +02:00
printsupport	Fix build on older MinGW versions	2014-03-17 23:00:50 +01:00
sqldrivers	Move the dbmstype to QSqlDriverPrivate so it can be used for all drivers	2013-04-02 19:02:26 +02:00
plugins.pro	Accessibility: Use factory function instead of plugin	2014-03-13 18:00:11 +01:00