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
73376eb4
Commit
73376eb4
authored
12 years ago
by
Sergio Ahumada
Browse files
Options
Download
Plain Diff
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle Change-Id: Ie8a79e8c58e45eab13391377dd33750ff2d98c08
parents
488532c4
0659af7e
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
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
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
src/3rdparty/javascriptcore/JavaScriptCore/config.h
+4
-4
src/3rdparty/javascriptcore/JavaScriptCore/config.h
src/script/api/qscriptable.h
+0
-4
src/script/api/qscriptable.h
src/script/api/qscriptclass.h
+0
-4
src/script/api/qscriptclass.h
src/script/api/qscriptclasspropertyiterator.h
+0
-4
src/script/api/qscriptclasspropertyiterator.h
src/script/api/qscriptcontext.h
+0
-4
src/script/api/qscriptcontext.h
src/script/api/qscriptcontextinfo.h
+1
-7
src/script/api/qscriptcontextinfo.h
src/script/api/qscriptengine.h
+0
-4
src/script/api/qscriptengine.h
src/script/api/qscriptengineagent.h
+0
-4
src/script/api/qscriptengineagent.h
src/script/api/qscriptextensioninterface.h
+0
-4
src/script/api/qscriptextensioninterface.h
src/script/api/qscriptextensionplugin.h
+0
-4
src/script/api/qscriptextensionplugin.h
src/script/api/qscriptprogram.h
+0
-4
src/script/api/qscriptprogram.h
src/script/api/qscriptstring.h
+0
-4
src/script/api/qscriptstring.h
src/script/api/qscriptvalue.h
+0
-4
src/script/api/qscriptvalue.h
src/script/api/qscriptvalueiterator.h
+0
-4
src/script/api/qscriptvalueiterator.h
src/script/api/qtscriptglobal.h
+0
-4
src/script/api/qtscriptglobal.h
src/scripttools/debugging/qscriptdebugger.cpp
+1
-2
src/scripttools/debugging/qscriptdebugger.cpp
src/scripttools/debugging/qscriptdebuggerconsole.cpp
+1
-1
src/scripttools/debugging/qscriptdebuggerconsole.cpp
src/scripttools/debugging/qscriptenginedebugger.h
+0
-4
src/scripttools/debugging/qscriptenginedebugger.h
tests/auto/qscriptengine/tst_qscriptengine.cpp
+2
-0
tests/auto/qscriptengine/tst_qscriptengine.cpp
with
9 additions
and
70 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