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
51a15892
Commit
51a15892
authored
5 years ago
by
Kari Oikarinen
Browse files
Options
Download
Plain Diff
Merge 5.14 into 5.14.1
Change-Id: Iefb900b42cc0476e62342724a5f3a480c09ce354
parents
3a06d021
3f8bcced
No related merge requests found
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
src/imports/qtquick2/plugins.qmltypes
+0
-1
src/imports/qtquick2/plugins.qmltypes
src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp
+11
-6
...plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp
src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.h
+2
-2
src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.h
src/qml/jsruntime/qv4sequenceobject.cpp
+3
-1
src/qml/jsruntime/qv4sequenceobject.cpp
src/qml/qml/qqmlengine.cpp
+2
-2
src/qml/qml/qqmlengine.cpp
src/quick/handlers/qquickmultipointhandler_p.h
+0
-1
src/quick/handlers/qquickmultipointhandler_p.h
src/quick/handlers/qquickwheelhandler.cpp
+8
-1
src/quick/handlers/qquickwheelhandler.cpp
src/quick/items/qquickevents.cpp
+131
-2
src/quick/items/qquickevents.cpp
src/quick/items/qquickitemsmodule.cpp
+3
-1
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquickitemview.cpp
+22
-14
src/quick/items/qquickitemview.cpp
src/quick/items/qquickitemview_p_p.h
+1
-0
src/quick/items/qquickitemview_p_p.h
src/quick/scenegraph/qsgrhitextureglyphcache.cpp
+2
-0
src/quick/scenegraph/qsgrhitextureglyphcache.cpp
tests/auto/qml/qqmlengine/data/evilSingletonInstantiation.qml
+6
-0
...s/auto/qml/qqmlengine/data/evilSingletonInstantiation.qml
tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+31
-0
tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST
+1
-0
tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST
tests/auto/quick/qquicklistview/data/changeModelAndDestroyTheOldOne.qml
+34
-0
...ck/qquicklistview/data/changeModelAndDestroyTheOldOne.qml
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+16
-0
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/touchmouse/BLACKLIST
+4
-0
tests/auto/quick/touchmouse/BLACKLIST
with
277 additions
and
31 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