Merge remote-tracking branch 'origin/5.15.0' into 5.15
Change-Id: I4f199bb8ea59a400bb5ee817c98f5e91df926956
Showing
- src/imports/quick3d/designer/AreaLightSection.qml 4 additions, 2 deletionssrc/imports/quick3d/designer/AreaLightSection.qml
- src/imports/quick3d/doc/qtquick3d.qdocconf 1 addition, 0 deletionssrc/imports/quick3d/doc/qtquick3d.qdocconf
- src/quick3d/qquick3dtexture.cpp 0 additions, 1 deletionsrc/quick3d/qquick3dtexture.cpp
- src/quick3d/qquick3dviewport.cpp 1 addition, 1 deletionsrc/quick3d/qquick3dviewport.cpp
- src/render/backends/gl/qssgrenderbackendgl3.cpp 1 addition, 0 deletionssrc/render/backends/gl/qssgrenderbackendgl3.cpp
- src/render/backends/gl/qssgrenderbackendgl3_p.h 9 additions, 2 deletionssrc/render/backends/gl/qssgrenderbackendgl3_p.h
- src/render/backends/gl/qssgrenderbackendgl4.cpp 2 additions, 0 deletionssrc/render/backends/gl/qssgrenderbackendgl4.cpp
- src/render/backends/gl/qssgrenderbackendgl4_p.h 4 additions, 0 deletionssrc/render/backends/gl/qssgrenderbackendgl4_p.h
- src/render/backends/gl/qssgrenderbackendglbase_p.h 0 additions, 2 deletionssrc/render/backends/gl/qssgrenderbackendglbase_p.h
- src/render/backends/gl/qssgrenderbackendgles2.cpp 1 addition, 0 deletionssrc/render/backends/gl/qssgrenderbackendgles2.cpp
- src/render/backends/gl/qssgrenderbackendgles2_p.h 3 additions, 2 deletionssrc/render/backends/gl/qssgrenderbackendgles2_p.h
- src/render/qssgrendershaderprogram.cpp 2 additions, 0 deletionssrc/render/qssgrendershaderprogram.cpp
- src/render/qssgrendershaderprogram_p.h 1 addition, 0 deletionssrc/render/qssgrendershaderprogram_p.h
- src/render/render.pro 3 additions, 1 deletionsrc/render/render.pro
- src/runtimerender/qssgrendercontextcore_p.h 2 additions, 0 deletionssrc/runtimerender/qssgrendercontextcore_p.h
Loading
Please register or sign in to comment