diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-12 13:25:09 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-12 13:25:09 (GMT) |
| commit | 05c1839531008d3cab40fb6fdaa22667c2133d7e (patch) | |
| tree | d13d25325b6b34311d30b8c396ffe99b06275e3f /demos | |
| parent | d39104d9b0ce43f872d2880baef8e1cff289adb8 (diff) | |
| parent | aeec06b844f21286fd228cbcc1cac7f5ea65e46b (diff) | |
| download | Qt-05c1839531008d3cab40fb6fdaa22667c2133d7e.zip Qt-05c1839531008d3cab40fb6fdaa22667c2133d7e.tar.gz Qt-05c1839531008d3cab40fb6fdaa22667c2133d7e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
dist/changes-4.6.0
src/corelib/tools/qscopedpointer_p.h
src/gui/widgets/qlcdnumber.cpp
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/textedit/example.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/textedit/example.html b/demos/textedit/example.html index 19b5520..6327b5f 100644 --- a/demos/textedit/example.html +++ b/demos/textedit/example.html @@ -26,7 +26,7 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p> <p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Images</span></p> <p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">Inline images are treated like ordinary ranges of characters in the text editor, so they flow with the surrounding text. Images can also be selected in the same way as text, making it easy to cut, copy, and paste them. </span></p> -<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><img src=":/images/logo32.png" /><span style=" font-style:italic;"> Try to select this image by clicking and dragging over it with the mouse, or use the text cursor to select it by holding down Shift and using the arrow keys. You can then cut or copy it, and pasting it into different parts of this document.</span></p> +<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><img src=":/images/logo32.png" /><span style=" font-style:italic;"> Try to select this image by clicking and dragging over it with the mouse, or use the text cursor to select it by holding down Shift and using the arrow keys. You can then cut or copy it, and paste it into different parts of this document.</span></p> <p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><span style=" font-size:16pt; font-weight:600;">Tables</span></p> <p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; font-weight:600;"><span style=" font-size:11pt; font-weight:400;">QTextEdit can arrange and format tables, supporting features such as row and column spans, text formatting within cells, and size constraints for columns. </span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"></p> |