Skip to content
GitLab
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
QtScript
Commits
c52cf2ad
Commit
c52cf2ad
authored
12 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge branch 'stable' into release
Change-Id: I7178c6375a3c2a555d9eb88922082d3af22a3f20
parents
3b26f6f6
7a09d123
Changes
350
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
LGPL_EXCEPTION.txt
+22
-0
LGPL_EXCEPTION.txt
LICENSE.FDL
+450
-0
LICENSE.FDL
LICENSE.GPL
+674
-0
LICENSE.GPL
LICENSE.LGPL
+514
-0
LICENSE.LGPL
doc/src/examples/context2d.qdoc
+1
-1
doc/src/examples/context2d.qdoc
doc/src/examples/defaultprototypes.qdoc
+2
-2
doc/src/examples/defaultprototypes.qdoc
doc/src/examples/helloscript.qdoc
+1
-1
doc/src/examples/helloscript.qdoc
examples/script/README
+1
-1
examples/script/README
examples/script/calculator/calculator.desktop
+1
-1
examples/script/calculator/calculator.desktop
examples/script/calculator/calculator.pro
+1
-1
examples/script/calculator/calculator.pro
examples/script/calculator/main.cpp
+1
-1
examples/script/calculator/main.cpp
examples/script/context2d/context2d.cpp
+1
-1
examples/script/context2d/context2d.cpp
examples/script/context2d/context2d.h
+1
-1
examples/script/context2d/context2d.h
examples/script/context2d/context2d.pro
+1
-1
examples/script/context2d/context2d.pro
examples/script/context2d/domimage.cpp
+1
-1
examples/script/context2d/domimage.cpp
examples/script/context2d/domimage.h
+1
-1
examples/script/context2d/domimage.h
examples/script/context2d/environment.cpp
+2
-2
examples/script/context2d/environment.cpp
examples/script/context2d/environment.h
+1
-1
examples/script/context2d/environment.h
examples/script/context2d/main.cpp
+1
-1
examples/script/context2d/main.cpp
examples/script/context2d/qcontext2dcanvas.cpp
+1
-1
examples/script/context2d/qcontext2dcanvas.cpp
with
1678 additions
and
18 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