AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d0a0a3c041
qt5base-lts/tests/auto/widgets/graphicsview/qgraphicsitem
History
Liang Qi d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	examples/network/fortuneclient/client.cpp
	examples/network/fortuneserver/server.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
	src/plugins/platforms/cocoa/qcocoabackingstore.h
	src/plugins/platforms/cocoa/qcocoaintegration.h
	src/plugins/platforms/cocoa/qcocoascreen.h
	src/plugins/platforms/ios/qiosbackingstore.h
	src/plugins/sqldrivers/oci/qsql_oci.cpp
	src/widgets/kernel/qwidgetwindow.cpp

Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
2017-10-17 10:34:24 +02:00
..
.gitignore Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
BLACKLIST Tests: Remove tst_QGraphicsIten::sorting from the BLACKLIST file 2015-04-22 10:50:50 +00:00
qgraphicsitem.pro QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00
tst_qgraphicsitem.cpp Merge remote-tracking branch 'origin/5.10' into dev 2017-10-17 10:34:24 +02:00