qt5base-lts/mkspecs/qnx-armv7le-qcc
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 Rename QNX arm mkspecs to be aligned with SDP structure 2014-04-04 10:53:38 +02:00
qplatformdefs.h Merge remote-tracking branch 'origin/stable' into dev 2014-04-11 14:36:55 +02:00