AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3ef6cf060e
qt5base-lts/tests/benchmarks/corelib
History
Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev 
Conflicts:
	qmake/generators/mac/pbuilder_pbx.cpp
	src/corelib/json/qjsonwriter.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm

Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
2013-07-11 16:42:01 +02:00
..
codecs Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
io Merge branch 'stable' into dev 2013-07-11 16:42:01 +02:00
json Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
kernel Fix QMetaType benchmark. 2013-05-13 13:29:48 +02:00
mimetypes Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
plugin Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
thread Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
tools Iterate over the smaller set in QSet::intersect(). 2013-06-05 09:35:42 +02:00
corelib.pro test: Moving tst_QMimeDatabase::inheritsPerformance() test 2012-10-31 19:56:42 +01:00