whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets/graphicsview/qgraphicsproxywidget
History
Liang Qi a1ad9a74eb Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/io/io.pri
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/network/socket/qabstractsocket.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
	tests/auto/dbus/qdbusconnection/qdbusconnection.pro
	tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
 		2015-09-25 14:02:04 +02:00
..
.gitignore Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
BLACKLIST Tests: Blacklist tests for ubuntu 14.04 2015-04-01 13:59:04 +00:00
qgraphicsproxywidget.pro QGraphicsView tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0. 2015-08-22 05:55:24 +00:00
tst_qgraphicsproxywidget.cpp Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00