qt6-bb10/tests/auto/widgets/graphicsview/qgraphicsview
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
.gitignore
BLACKLIST Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
qgraphicsview.pro Enable tst_QGraphicsView on OSX 2014-11-19 16:13:43 +01:00
tst_qgraphicsview.cpp Replace MAC OS X with OS X 2015-06-30 07:33:31 +00:00
tst_qgraphicsview.h Update copyright headers 2015-02-11 06:49:51 +00:00
tst_qgraphicsview_2.cpp Update copyright headers 2015-02-11 06:49:51 +00:00