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
0874c2a1
Commit
0874c2a1
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I2e7fc085663e00dd0390593a91c30d23d1369c4e
parents
a29337be
dd08a22a
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
src/qml/debugger/debugger.pri
+0
-5
src/qml/debugger/debugger.pri
src/quick/doc/src/examples.qdoc
+12
-12
src/quick/doc/src/examples.qdoc
src/quick/doc/src/qmltypereference.qdoc
+3
-3
src/quick/doc/src/qmltypereference.qdoc
src/quick/items/qquickborderimage.cpp
+62
-362
src/quick/items/qquickborderimage.cpp
src/quick/items/qquickborderimage_p.h
+0
-2
src/quick/items/qquickborderimage_p.h
src/quick/items/qquickborderimage_p_p.h
+0
-10
src/quick/items/qquickborderimage_p_p.h
src/quick/items/qquickimagebase_p_p.h
+0
-3
src/quick/items/qquickimagebase_p_p.h
src/quick/items/qquicktext.cpp
+42
-3
src/quick/items/qquicktext.cpp
src/quick/items/qquicktext_p.h
+1
-0
src/quick/items/qquicktext_p.h
src/quick/items/qquicktext_p_p.h
+1
-0
src/quick/items/qquicktext_p_p.h
src/quick/items/qquicktextedit.cpp
+31
-0
src/quick/items/qquicktextedit.cpp
src/quick/items/qquicktextedit_p.h
+2
-0
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput.cpp
+27
-0
src/quick/items/qquicktextinput.cpp
src/quick/items/qquicktextinput_p.h
+4
-0
src/quick/items/qquicktextinput_p.h
src/quick/scenegraph/qsgadaptationlayer_p.h
+0
-12
src/quick/scenegraph/qsgadaptationlayer_p.h
src/quick/scenegraph/qsgdefaultimagenode.cpp
+9
-48
src/quick/scenegraph/qsgdefaultimagenode.cpp
src/quick/scenegraph/qsgdefaultimagenode_p.h
+1
-2
src/quick/scenegraph/qsgdefaultimagenode_p.h
src/quick/scenegraph/qsgwindowsrenderloop.cpp
+18
-3
src/quick/scenegraph/qsgwindowsrenderloop.cpp
tools/qml/main.cpp
+4
-1
tools/qml/main.cpp
with
217 additions
and
466 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