AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
189dc655bb
qt5base-lts/tests/benchmarks/corelib
History
Oswald Buddenhagen 189dc655bb Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/tools/qbytearray.cpp
	src/gui/image/qimage.cpp
	src/gui/image/qppmhandler.cpp
	src/gui/kernel/qguiapplication.cpp
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765
2014-09-29 14:08:49 +02:00
..
codecs Update license headers and add new license files 2014-09-24 12:26:19 +02:00
io Merge remote-tracking branch 'origin/5.4' into dev 2014-09-29 14:08:49 +02:00
json Update license headers and add new license files 2014-09-24 12:26:19 +02:00
kernel Update license headers and add new license files 2014-09-24 12:26:19 +02:00
mimetypes Update license headers and add new license files 2014-09-24 12:26:19 +02:00
plugin Update license headers and add new license files 2014-09-24 12:26:19 +02:00
thread Update license headers and add new license files 2014-09-24 12:26:19 +02:00
tools Merge remote-tracking branch 'origin/5.4' into dev 2014-09-29 14:08:49 +02:00
corelib.pro test: Moving tst_QMimeDatabase::inheritsPerformance() test 2012-10-31 19:56:42 +01:00