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
QtDeclarative
Commits
fa520d0c
Commit
fa520d0c
authored
10 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4' into 5.4.0
Change-Id: I2c69deb3bc69da1a06485aaf72fb298b08756734
parents
3d389f2a
868def84
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.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
wip/dbus
wip/itemviews
wip/nacl
wip/new-backend
wip/pointerhandler
wip/propertycache-refactor
wip/qquickdeliveryagent
wip/scenegraphng
wip/tizen
wip/webassembly
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
No related merge requests found
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
src/qml/compiler/qv4ssa.cpp
+12
-8
src/qml/compiler/qv4ssa.cpp
src/qml/debugger/qqmldebugserver.cpp
+1
-0
src/qml/debugger/qqmldebugserver.cpp
src/qml/debugger/qqmlenginedebugservice.cpp
+10
-2
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/jsruntime/qv4internalclass.cpp
+17
-18
src/qml/jsruntime/qv4internalclass.cpp
src/qml/qml/qqmllocale_p.h
+1
-1
src/qml/qml/qqmllocale_p.h
src/quick/items/qquickwindow.cpp
+12
-2
src/quick/items/qquickwindow.cpp
src/quick/items/qquickwindowattached.cpp
+6
-0
src/quick/items/qquickwindowattached.cpp
src/quick/items/qquickwindowattached_p.h
+3
-0
src/quick/items/qquickwindowattached_p.h
src/quick/scenegraph/qsgadaptationlayer.cpp
+162
-0
src/quick/scenegraph/qsgadaptationlayer.cpp
src/quick/scenegraph/qsgadaptationlayer_p.h
+4
-0
src/quick/scenegraph/qsgadaptationlayer_p.h
src/quick/scenegraph/qsgcontext.cpp
+1
-0
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
+0
-173
src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
src/quick/scenegraph/scenegraph.pri
+1
-0
src/quick/scenegraph/scenegraph.pri
tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
+39
-1
...ger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+0
-4
tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
tests/auto/quick/qquickwindow/data/windowattached.qml
+2
-0
tests/auto/quick/qquickwindow/data/windowattached.qml
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+22
-0
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
tools/qmlscene/main.cpp
+3
-9
tools/qmlscene/main.cpp
with
296 additions
and
218 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