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
..
qmake.conf
qplatformdefs.h	Merge remote-tracking branch 'origin/stable' into dev	2014-04-11 14:36:55 +02:00