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
269b1d56
Commit
269b1d56
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9c6f6ae4cfc72fc350fffc2ff1edf113d783a8f6
parents
82f5d3ad
95884805
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.7
5.8
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
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
.qmake.conf
+0
-1
.qmake.conf
LICENSE.GPLv2
+1
-1
LICENSE.GPLv2
LICENSE.GPLv3
+1
-1
LICENSE.GPLv3
LICENSE.LGPLv3
+1
-1
LICENSE.LGPLv3
src/imports/qtcanvas3d/renderjob.cpp
+3
-1
src/imports/qtcanvas3d/renderjob.cpp
tests/manual/commandthroughput/qml/commandthroughput/commandthroughput.js
+1
-1
...mandthroughput/qml/commandthroughput/commandthroughput.js
with
7 additions
and
6 deletions
.qmake.conf
+
0
−
1
View file @
269b1d56
load
(
qt_build_config
)
CONFIG
+=
qt_example_installs
MODULE_VERSION
=
5
.
7
.
1
...
...
This diff is collapsed.
Click to expand it.
LICENSE.GPLv2
+
1
−
1
View file @
269b1d56
...
...
@@ -3,7 +3,7 @@
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt
GUI
Toolkit under the terms of
You may use, distribute and copy the Qt Toolkit under the terms of
GNU General Public License version 2, which is displayed below.
-------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
LICENSE.GPLv3
+
1
−
1
View file @
269b1d56
...
...
@@ -3,7 +3,7 @@
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt
GUI
Toolkit under the terms of
You may use, distribute and copy the Qt Toolkit under the terms of
GNU Lesser General Public License version 3. That license references
the General Public License version 3, that is displayed below. Other
portions of the Qt Toolkit may be licensed directly under this license.
...
...
This diff is collapsed.
Click to expand it.
LICENSE.LGPLv3
+
1
−
1
View file @
269b1d56
...
...
@@ -3,7 +3,7 @@
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt
GUI
Toolkit under the terms of
You may use, distribute and copy the Qt Toolkit under the terms of
GNU Lesser General Public License version 3, which is displayed below.
This license makes reference to the version 3 of the GNU General
Public License, which you can find in the LICENSE.GPLv3 file.
...
...
This diff is collapsed.
Click to expand it.
src/imports/qtcanvas3d/renderjob.cpp
+
3
−
1
View file @
269b1d56
...
...
@@ -85,7 +85,9 @@ void CanvasRenderJob::run()
QSurface
*
oldSurface
(
0
);
if
(
!
m_renderer
->
usingQtContext
())
{
oldContext
=
QOpenGLContext
::
currentContext
();
oldSurface
=
oldContext
->
surface
();
if
(
oldContext
)
oldSurface
=
oldContext
->
surface
();
m_renderer
->
makeCanvasContextCurrent
();
}
...
...
This diff is collapsed.
Click to expand it.
tests/manual/commandthroughput/qml/commandthroughput/commandthroughput.js
+
1
−
1
View file @
269b1d56
...
...
@@ -26,7 +26,7 @@
**
****************************************************************************/
Qt
.
include
(
"
../../../examples/canvas3d/
canvas3d/
3rdparty/gl-matrix.js
"
)
Qt
.
include
(
"
../../../examples/canvas3d/3rdparty/gl-matrix.js
"
)
//
// Draws a cube that has the Qt logo as decal texture on each face in to a texture.
...
...
This diff is collapsed.
Click to expand it.
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