qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/examples/quick/scenegraph
History
Qt Forward Merge Bot 3e758800b4 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	src/imports/qtqml/plugin.cpp
	src/qml/qml/qqml.h
	src/qml/qml/qqmlmetatype.cpp
	src/qml/qml/qqmlmetatype_p.h
	src/qml/qml/qqmltypeloader.cpp
	src/qml/types/qqmlbind.cpp
	src/quick/items/qquickitemsmodule.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: I52548938a582cb6510271ed4bc3a9aa0c3c11df6
 		2020-02-17 10:21:59 +01:00
..
customgeometry Generate registrations for all examples 2020-01-13 16:47:57 +01:00
d3d11underqml Generate registrations for all examples 2020-01-13 16:47:57 +01:00
fboitem Quick: Don't qualify OpenGL includes 2020-01-27 13:03:18 +01:00
graph Generate registrations for all examples 2020-01-13 16:47:57 +01:00
metaltextureimport Modernize type registration in new examples 2020-02-11 19:26:44 +01:00
metalunderqml Generate registrations for all examples 2020-01-13 16:47:57 +01:00
openglunderqml Quick: Don't qualify OpenGL includes 2020-01-27 13:03:18 +01:00
rendernode Merge remote-tracking branch 'origin/5.15' into dev 2020-02-17 10:21:59 +01:00
sgengine Update to new QRandomGenerator API 2017-11-03 09:12:14 +00:00
shared Add the graphics api independent scenegraph port 2019-07-04 10:44:26 +02:00
simplematerial Generate registrations for all examples 2020-01-13 16:47:57 +01:00
textureinthread Quick: Don't qualify OpenGL includes 2020-01-27 13:03:18 +01:00
threadedanimation Generate registrations for all examples 2020-01-13 16:47:57 +01:00
twotextureproviders Quick: Don't qualify OpenGL includes 2020-01-27 13:03:18 +01:00
vulkantextureimport Modernize type registration in new examples 2020-02-11 19:26:44 +01:00
vulkanunderqml Modernize type registration in new examples 2020-02-11 19:26:44 +01:00
scenegraph.pro Add vulkantextureimport example 2019-12-12 13:51:07 +01:00