whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/gui/image
History
Allan Sandfeld Jensen 1fce111809 Merge remote-tracking branch 'origin/5.4' into merge5.5 
Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/io/qnoncontiguousbytedevice_p.h
	src/gui/image/qjpeghandler.cpp
	src/network/access/qhttpthreaddelegate_p.h
	tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
	tests/auto/widgets/widgets/qmenubar/BLACKLIST

Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3
 		2015-05-08 13:26:44 +02:00
..
qicoimageformat Update copyright headers 2015-02-11 06:49:51 +00:00
qicon Update copyright headers 2015-02-11 06:49:51 +00:00
qimage Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00
qimageiohandler Update copyright headers 2015-02-11 06:49:51 +00:00
qimagereader MSVC: Remove use of -Zm argument 2015-02-13 21:23:19 +00:00
qimagewriter MSVC: Remove use of -Zm argument 2015-02-13 21:23:19 +00:00
qmovie Update copyright headers 2015-02-11 06:49:51 +00:00
qpicture Update copyright headers 2015-02-11 06:49:51 +00:00
qpixmap Add tests for detach on setDevicePixelRatio() 2015-03-24 11:22:36 +00:00
qpixmapcache Update copyright headers 2015-02-11 06:49:51 +00:00
image.pro
…