Oswald Buddenhagen 143c4d3e13 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3		2012-04-10 15:31:45 +02:00
..
testData/render	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
Ash_European.jpg	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
graphicsScene_selection.data	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
images.qrc	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qgraphicsscene.pro	Make 'nmake check' succeed for widgets tests	2012-02-17 14:08:19 +01:00
tst_qgraphicsscene.cpp	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00