whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/benchmarks/gui
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
..
animation Updated license headers 2016-01-21 18:55:18 +00:00
graphicsview Remove Windows CE from tests (others). 2016-03-31 06:14:04 +00:00
image Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
itemviews Updated license headers 2016-01-21 18:55:18 +00:00
kernel Updated license headers 2016-01-21 18:55:18 +00:00
math3d Updated license headers 2016-01-21 18:55:18 +00:00
painting Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-10 17:43:13 +02:00
styles Updated license headers 2016-01-21 18:55:18 +00:00
text Improve performance of Qt::mightBeRichText by using QStringRef 2016-07-11 12:30:31 +00:00
gui.pro add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00