J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qgraphicsitem.pro	WinRT: Fix various test compilations	2013-10-02 12:36:05 +02:00
tst_qgraphicsitem.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00