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 8a22c92b55 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	src/imports/folderlistmodel/plugin.cpp
	src/imports/layouts/plugin.cpp
	src/imports/localstorage/plugin.cpp
	src/imports/models/plugin.cpp
	src/imports/particles/plugin.cpp
	src/imports/qtqml/plugin.cpp
	src/imports/qtquick2/plugin.cpp
	src/imports/shapes/plugin.cpp
	src/imports/statemachine/plugin.cpp
	src/imports/testlib/main.cpp
	src/imports/wavefrontmesh/plugin.cpp
	src/imports/window/plugin.cpp
	src/imports/workerscript/plugin.cpp
	src/qml/jsruntime/qv4sequenceobject.cpp
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp
	src/qmlmodels/qqmlmodelsmodule_p.h
	src/qmlworkerscript/qqmlworkerscriptmodule.cpp
	src/qmlworkerscript/qqmlworkerscriptmodule_p.h
	src/quick/items/qquickitemsmodule.cpp

Change-Id: I5f1fbc3d00e8f583d2c89afc5389de84d68633a7
 		2020-01-14 11:24:11 +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 Generate registrations for all examples 2020-01-13 16:47:57 +01:00
graph Generate registrations for all examples 2020-01-13 16:47:57 +01:00
metaltextureimport Fix Metal usage on iOS 2019-11-27 21:50:52 +01:00
metalunderqml Generate registrations for all examples 2020-01-13 16:47:57 +01:00
openglunderqml Generate registrations for all examples 2020-01-13 16:47:57 +01:00
rendernode Merge remote-tracking branch 'origin/5.15' into dev 2020-01-14 11:24:11 +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 Generate registrations for all examples 2020-01-13 16:47:57 +01:00
threadedanimation Generate registrations for all examples 2020-01-13 16:47:57 +01:00
twotextureproviders Generate registrations for all examples 2020-01-13 16:47:57 +01:00
vulkantextureimport Minimal documentation for new example 2019-12-12 13:51:16 +01:00
vulkanunderqml Add guards in .pro of platform/api-specific scenegraph examples 2019-10-10 09:54:22 +02:00
scenegraph.pro Add vulkantextureimport example 2019-12-12 13:51:07 +01:00