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
3ac87eeb
Commit
3ac87eeb
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: .qmake.conf Change-Id: If94e1ceeb1b03ef59bf5760931fdba9527815064
parents
a693bff7
2041335c
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.9
5.9.8
6.2.0
6.2.1
6.2.2
dev
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
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
src/imports/qtcanvas3d/canvas3d.cpp
+3
-4
src/imports/qtcanvas3d/canvas3d.cpp
src/imports/qtcanvas3d/canvasrenderer.cpp
+2
-15
src/imports/qtcanvas3d/canvasrenderer.cpp
src/imports/qtcanvas3d/glstatestore.cpp
+1
-1
src/imports/qtcanvas3d/glstatestore.cpp
src/imports/qtcanvas3d/openglversionchecker.cpp
+89
-0
src/imports/qtcanvas3d/openglversionchecker.cpp
src/imports/qtcanvas3d/openglversionchecker_p.h
+74
-0
src/imports/qtcanvas3d/openglversionchecker_p.h
src/imports/qtcanvas3d/qtcanvas3d.pro
+4
-2
src/imports/qtcanvas3d/qtcanvas3d.pro
sync.profile
+0
-10
sync.profile
with
173 additions
and
32 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