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
c085f612
Commit
c085f612
authored
9 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I4cd87aa85fa4067c79acc03e25ada7f1796e06ae
parents
5b74d56e
a3f415d2
6.2
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.6
5.7
5.8
5.9
5.9.8
6.2.0
6.2.1
6.2.2
dev
wip/threading
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
No related merge requests found
Changes
81
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
3rdparty/js-test-pre.js
+0
-271
3rdparty/js-test-pre.js
examples/3rdparty/ThreeJSLoader.js
+0
-0
examples/3rdparty/ThreeJSLoader.js
examples/3rdparty/gl-matrix.js
+0
-0
examples/3rdparty/gl-matrix.js
examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
+20
-15
examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
examples/canvas3d/framebuffer/framebuffer.qrc
+1
-1
examples/canvas3d/framebuffer/framebuffer.qrc
examples/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
+1
-1
examples/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
examples/canvas3d/framebuffer/qml/framebuffer/main.qml
+1
-11
examples/canvas3d/framebuffer/qml/framebuffer/main.qml
examples/canvas3d/interaction/doc/src/interaction.qdoc
+19
-14
examples/canvas3d/interaction/doc/src/interaction.qdoc
examples/canvas3d/interaction/interaction.qrc
+2
-2
examples/canvas3d/interaction/interaction.qrc
examples/canvas3d/interaction/qml/interaction/interaction.js
+2
-2
examples/canvas3d/interaction/qml/interaction/interaction.js
examples/canvas3d/interaction/qml/interaction/main.qml
+1
-11
examples/canvas3d/interaction/qml/interaction/main.qml
examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
+27
-23
examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
examples/canvas3d/jsonmodels/jsonmodels.qml
+1
-11
examples/canvas3d/jsonmodels/jsonmodels.qml
examples/canvas3d/jsonmodels/jsonmodelsbasic.qml
+1
-11
examples/canvas3d/jsonmodels/jsonmodelsbasic.qml
examples/canvas3d/jsonmodels/qml.qrc
+2
-2
examples/canvas3d/jsonmodels/qml.qrc
examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
+54
-47
...les/canvas3d/textureandlight/doc/src/textureandlight.qdoc
examples/canvas3d/textureandlight/main.cpp
+6
-6
examples/canvas3d/textureandlight/main.cpp
examples/canvas3d/textureandlight/qml/textureandlight/main.qml
+1
-11
...les/canvas3d/textureandlight/qml/textureandlight/main.qml
examples/canvas3d/textureandlight/textureandlight.qrc
+1
-1
examples/canvas3d/textureandlight/textureandlight.qrc
src/imports/imports.pro
+5
-0
src/imports/imports.pro
with
145 additions
and
440 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