whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/gui
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
..
image Merge remote-tracking branch 'origin/5.4' into dev 2014-09-29 14:08:49 +02:00
itemmodels 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
math3d Update license headers and add new license files 2014-09-24 12:26:19 +02:00
painting Merge remote-tracking branch 'origin/5.4' into dev 2014-09-29 14:08:49 +02:00
qopengl Update license headers and add new license files 2014-09-24 12:26:19 +02:00
text Merge remote-tracking branch 'origin/5.4' into dev 2014-09-29 14:08:49 +02:00
util Update license headers and add new license files 2014-09-24 12:26:19 +02:00
gui.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00