qt6-bb10

Commit Graph

Author	SHA1	Message	Date
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
David Morgan	d444bbf110	glgen: Added support for parsing the new xml spec. The .spec file is no longer updated thus support for gl 4.4 is impossible without an update to parse the new xml spec. The legacy parser can be used with the -l (--legacy) switch. Task-number: QTBUG-33671 Task-number: QTBUG-40090 Change-Id: I83d9380842a16e925f6c07331ee35fe035f6baa9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>	2014-08-29 12:41:21 +02:00

Author

SHA1

Message

Date

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

David Morgan

d444bbf110

glgen: Added support for parsing the new xml spec.

The .spec file is no longer updated thus support for gl 4.4 is impossible without an update to parse the new xml spec. The legacy parser can be used with the -l (--legacy) switch.

Task-number: QTBUG-33671
Task-number: QTBUG-40090
Change-Id: I83d9380842a16e925f6c07331ee35fe035f6baa9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2014-08-29 12:41:21 +02:00

2 Commits (bdcb3f9aab139e31849aec46088dce52ba7673eb)