projects / profile / ivi / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 76ed62f) | patch
Support inline images with <img> tag in StyledText
authorYann Bodson <yann.bodson@nokia.com>
Mon, 28 Nov 2011 01:26:40 +0000 (11:26 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 2 Feb 2012 10:11:53 +0000 (11:11 +0100)
commit8872c0716fb33e33311a78e693b61d3dd6b656c1
tree01b970d0cc196cb99b971f9905d3a002a1a97190tree | snapshot
parent76ed62fb836ea3e3e5236f8ed567f7ac64dd63fccommit | diff
Support inline images with <img> tag in StyledText

Task-number: QTBUG-21793
Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
21 files changed:
examples/declarative/text/imgtag/TextWithImage.qml [new file with mode: 0644] blob
examples/declarative/text/imgtag/images/face-sad.png [new file with mode: 0644] blob
examples/declarative/text/imgtag/images/face-smile-big.png [new file with mode: 0644] blob
examples/declarative/text/imgtag/images/face-smile.png [new file with mode: 0644] blob
examples/declarative/text/imgtag/images/heart200.png [new file with mode: 0644] blob
examples/declarative/text/imgtag/images/qtlogo.png [new file with mode: 0644] blob
examples/declarative/text/imgtag/images/starfish_2.png [new file with mode: 0644] blob
examples/declarative/text/imgtag/imgtag.qml [new file with mode: 0644] blob
examples/declarative/text/styledtext-layout.qml diff | blob | history
src/quick/items/qquicktext.cpp diff | blob | history
src/quick/items/qquicktext_p.h diff | blob | history
src/quick/items/qquicktext_p_p.h diff | blob | history
src/quick/util/qdeclarativestyledtext.cpp diff | blob | history
src/quick/util/qdeclarativestyledtext_p.h diff | blob | history
tests/auto/qtquick2/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp diff | blob | history
tests/auto/qtquick2/qquicktext/data/images/face-sad.png [new file with mode: 0644] blob
tests/auto/qtquick2/qquicktext/data/images/heart200.png [new file with mode: 0644] blob
tests/auto/qtquick2/qquicktext/data/images/starfish_2.png [new file with mode: 0644] blob
tests/auto/qtquick2/qquicktext/data/imgTagsElide.qml [new file with mode: 0644] blob
tests/auto/qtquick2/qquicktext/data/imgTagsUpdates.qml [new file with mode: 0644] blob
tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp diff | blob | history
Domain: UI Framework / Uncategorized;