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
QtScript
Commits
d8232635
Commit
d8232635
authored
12 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I3b5356983f0b86a4c5e339ebb1eae2c20e825b70
parents
1e470ee3
aaddb67d
dev
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.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.15.3
5.15.4
5.15.5
5.15.6
5.15.7
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
old/5.1
old/5.2
wip/android
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
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
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
v5.1.0
v5.1.0-rc2
v5.1.0-rc1
v5.1.0-beta1
v5.1.0-alpha1
No related merge requests found
Changes
339
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
doc/src/examples/context2d.qdoc
+1
-1
doc/src/examples/context2d.qdoc
doc/src/examples/defaultprototypes.qdoc
+1
-1
doc/src/examples/defaultprototypes.qdoc
doc/src/examples/helloscript.qdoc
+1
-1
doc/src/examples/helloscript.qdoc
doc/src/snippets/code/src.scripttools.qscriptenginedebugger.cpp
+1
-1
...c/snippets/code/src.scripttools.qscriptenginedebugger.cpp
doc/src/snippets/scriptdebugger.cpp
+1
-1
doc/src/snippets/scriptdebugger.cpp
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
+1
-1
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
examples/script/context2d/qcontext2dcanvas.h
+1
-1
examples/script/context2d/qcontext2dcanvas.h
examples/script/context2d/window.cpp
+1
-1
examples/script/context2d/window.cpp
examples/script/context2d/window.h
+1
-1
examples/script/context2d/window.h
examples/script/customclass/bytearrayclass.cpp
+1
-1
examples/script/customclass/bytearrayclass.cpp
with
20 additions
and
20 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