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 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
 		2016-08-16 07:58:32 +02:00
..
.gitignore
…
BLACKLIST Blacklisting autotests that fail on RHEL 7.1 also on RHEL 7.2 2016-04-15 05:57:02 +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.7' into dev 2016-08-16 07:58:32 +02:00