Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtCanvas3D
Commits
f0b9df12
Commit
f0b9df12
authored
10 years ago
by
Sergio Ahumada
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I77b259a88afca70aba4699cd9c61e20ee5ac8dfa
parents
eca95e7b
1c47360d
Changes
30
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.qmake.conf
+1
-1
.qmake.conf
creatortemplates/qtcanvas3d/wizard.xml
+15
-18
creatortemplates/qtcanvas3d/wizard.xml
examples/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
+2
-1
examples/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
examples/canvas3d/interaction/main.cpp
+15
-18
examples/canvas3d/interaction/main.cpp
examples/canvas3d/interaction/qml/interaction/interaction.js
+2
-1
examples/canvas3d/interaction/qml/interaction/interaction.js
examples/canvas3d/jsonmodels/jsonmodels.js
+2
-2
examples/canvas3d/jsonmodels/jsonmodels.js
examples/canvas3d/jsonmodels/jsonmodels.qml
+36
-0
examples/canvas3d/jsonmodels/jsonmodels.qml
examples/canvas3d/jsonmodels/jsonmodelsbasic.qml
+36
-0
examples/canvas3d/jsonmodels/jsonmodelsbasic.qml
examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
+38
-5
...les/canvas3d/textureandlight/doc/src/textureandlight.qdoc
examples/canvas3d/textureandlight/main.cpp
+10
-0
examples/canvas3d/textureandlight/main.cpp
examples/canvas3d/textureandlight/qml/textureandlight/main.qml
+8
-0
...les/canvas3d/textureandlight/qml/textureandlight/main.qml
examples/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
+0
-2
...3d/textureandlight/qml/textureandlight/textureandlight.js
examples/canvas3d/textureandlight/textureandlight.qrc
+1
-1
examples/canvas3d/textureandlight/textureandlight.qrc
src/activeinfo3d.cpp
+1
-1
src/activeinfo3d.cpp
src/canvas3d.cpp
+72
-115
src/canvas3d.cpp
src/canvas3d_p.h
+12
-6
src/canvas3d_p.h
src/canvasrendernode.cpp
+6
-6
src/canvasrendernode.cpp
src/context3d.cpp
+797
-812
src/context3d.cpp
src/context3d_p.h
+0
-8
src/context3d_p.h
src/contextattributes.cpp
+1
-1
src/contextattributes.cpp
with
1055 additions
and
998 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets