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
QtDeclarative
Commits
6e70fa5e
Commit
6e70fa5e
authored
10 years ago
by
Frederik Gladhorn
Committed by
The Qt Project
10 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
parents
77d6aef4
8b88e37b
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
src/qml/compiler/qqmltypecompiler.cpp
+2
-2
src/qml/compiler/qqmltypecompiler.cpp
src/qml/qml/qqmldata_p.h
+1
-1
src/qml/qml/qqmldata_p.h
src/qml/qml/qqmlobjectcreator.cpp
+21
-6
src/qml/qml/qqmlobjectcreator.cpp
src/qml/qml/qqmlobjectcreator_p.h
+1
-0
src/qml/qml/qqmlobjectcreator_p.h
src/quick/items/qquickflickable.cpp
+20
-21
src/quick/items/qquickflickable.cpp
src/quick/items/qquickflickable_p_p.h
+2
-0
src/quick/items/qquickflickable_p_p.h
src/quick/items/qquickmousearea_p.h
+17
-17
src/quick/items/qquickmousearea_p.h
src/quick/items/qquickscreen_p.h
+9
-9
src/quick/items/qquickscreen_p.h
src/quick/items/qquickshadereffectsource.cpp
+1
-1
src/quick/items/qquickshadereffectsource.cpp
tests/auto/qml/qqmlecmascript/testtypes.cpp
+60
-0
tests/auto/qml/qqmlecmascript/testtypes.cpp
tests/auto/qml/qqmlecmascript/testtypes.h
+45
-0
tests/auto/qml/qqmlecmascript/testtypes.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+28
-0
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/qmltest/listview/tst_listview.qml
+41
-0
tests/auto/qmltest/listview/tst_listview.qml
with
248 additions
and
57 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
