Merge remote-tracking branch 'origin/5.15' into 5.15.0
Change-Id: I2a597dac9a5b69f4e3cb787a7cba33ef871603b4
No related branches found
No related tags found
Showing
- dist/changes-5.14.2 20 additions, 0 deletionsdist/changes-5.14.2
- examples/quick3d/dynamictexture/Doors.qml 0 additions, 1 deletionexamples/quick3d/dynamictexture/Doors.qml
- examples/quick3d/hellocube/doc/src/hellocube.qdoc 0 additions, 3 deletionsexamples/quick3d/hellocube/doc/src/hellocube.qdoc
- examples/quick3d/hellocube/main.qml 0 additions, 1 deletionexamples/quick3d/hellocube/main.qml
- examples/quick3d/principledmaterial/main.qml 1 addition, 1 deletionexamples/quick3d/principledmaterial/main.qml
- src/assetimport/assetimport.pro 4 additions, 2 deletionssrc/assetimport/assetimport.pro
- src/assetimport/qssgmeshbvhbuilder.cpp 306 additions, 0 deletionssrc/assetimport/qssgmeshbvhbuilder.cpp
- src/assetimport/qssgmeshbvhbuilder_p.h 101 additions, 0 deletionssrc/assetimport/qssgmeshbvhbuilder_p.h
- src/imports/quick3d/doc/src/qtquick3d-helpers.qdoc 1 addition, 1 deletionsrc/imports/quick3d/doc/src/qtquick3d-helpers.qdoc
- src/imports/quick3d/doc/src/qtquick3d-materials.qdoc 1 addition, 1 deletionsrc/imports/quick3d/doc/src/qtquick3d-materials.qdoc
- src/imports/quick3d/doc/src/qtquick3d-qmlmodule.qdoc 1 addition, 1 deletionsrc/imports/quick3d/doc/src/qtquick3d-qmlmodule.qdoc
- src/plugins/assetimporters/assetimporters.pro 1 addition, 1 deletionsrc/plugins/assetimporters/assetimporters.pro
- src/plugins/assetimporters/configure.json 7 additions, 7 deletionssrc/plugins/assetimporters/configure.json
- src/quick3d/qquick3dabstractlight.cpp 1 addition, 1 deletionsrc/quick3d/qquick3dabstractlight.cpp
- src/quick3d/qquick3dabstractlight_p.h 1 addition, 1 deletionsrc/quick3d/qquick3dabstractlight_p.h
- src/quick3d/qquick3dcamera.cpp 16 additions, 2 deletionssrc/quick3d/qquick3dcamera.cpp
- src/quick3d/qquick3dcamera_p.h 1 addition, 1 deletionsrc/quick3d/qquick3dcamera_p.h
- src/quick3d/qquick3ddefaultmaterial.cpp 7 additions, 4 deletionssrc/quick3d/qquick3ddefaultmaterial.cpp
- src/quick3d/qquick3dnode_p.h 2 additions, 0 deletionssrc/quick3d/qquick3dnode_p.h
- src/quick3d/qquick3dquaternionutils.cpp 11 additions, 8 deletionssrc/quick3d/qquick3dquaternionutils.cpp
Loading
Please register or sign in to comment