Conflicts:
	src/imports/qtcanvas3d/canvas3d.cpp
	src/imports/qtcanvas3d/context3d.cpp
	src/imports/qtcanvas3d/context3d_p.h
	src/imports/qtcanvas3d/framebuffer3d.cpp
	src/imports/qtcanvas3d/framebuffer3d_p.h
	src/imports/qtcanvas3d/program3d.cpp
	src/imports/qtcanvas3d/uniformlocation.cpp
	src/imports/qtcanvas3d/uniformlocation_p.h

Change-Id: I214239d40936e14dd69498167b08f199a692f325