AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cba24d65c4
qt5base-lts/tests/benchmarks/corelib
History
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
..
codecs Updated license headers 2016-01-21 18:55:18 +00:00
io Use QT_LSTAT instead of lstat directly 2017-09-15 20:52:23 +00:00
json Updated license headers 2016-01-21 18:55:18 +00:00
kernel QMetaType: Add a benchmark covering creation of QVariant from an enum 2016-07-22 12:47:05 +00:00
mimetypes Updated license headers 2016-01-21 18:55:18 +00:00
plugin Updated license headers 2016-01-21 18:55:18 +00:00
thread Replace Q_DECL_OVERRIDE with override where possible 2017-09-19 11:53:42 +00:00
tools Restore compatibility with pre-5.9 Keccak calculation 2017-09-21 03:21:58 +00:00
corelib.pro