qt5base-lts/tests/benchmarks/gui
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
..
animation Updated license headers 2016-01-21 18:55:18 +00:00
graphicsview Merge remote-tracking branch 'origin/5.10' into dev 2017-10-17 10:34:24 +02:00
image Modularize configure.json/.pri 2016-09-15 08:23:53 +00:00
itemviews Updated license headers 2016-01-21 18:55:18 +00:00
kernel Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +00:00
math3d Updated license headers 2016-01-21 18:55:18 +00:00
painting Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +00:00
styles Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +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