qt5base-lts/tests/benchmarks/gui/graphicsview
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
..
functional Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +00:00
qgraphicsanchorlayout Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsitem Deprecate QCoreApplication::flush() 2017-04-22 15:18:01 +00:00
qgraphicslayout Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +00:00
qgraphicslinearlayout Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsscene Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qgraphicsview Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +00:00
qgraphicswidget Updated license headers 2016-01-21 18:55:18 +00:00
graphicsview.pro add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00