diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-03-11 14:27:08 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-04-04 12:29:41 +0100 |
commit | c0236b9f37d27cbc42c1c84b9f91b54c4ef2a0ac (patch) | |
tree | 221e26b84453767d76a9b9c76e1b72f3d6b724c5 /doc/src/snippets | |
parent | 2b0be2d3d78422234dce30934ca2b9e9dd95298f (diff) |
Add Qt Quick changelog items to whatsnew63.qdoc
Amends 28dd0b133435e044224c3141265e14f2a2586efc. The process to generate
these apparently didn't include reading ChangeLog entries to find the notable
new features.
Pick-to: 6.3
Change-Id: I3229755c1f797d700278bf1f9df63e3d410db450
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'doc/src/snippets')
-rw-r--r-- | doc/src/snippets/declarative/text-lines.qml | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/doc/src/snippets/declarative/text-lines.qml b/doc/src/snippets/declarative/text-lines.qml new file mode 100644 index 000000000..dab6ef96b --- /dev/null +++ b/doc/src/snippets/declarative/text-lines.qml @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//![0] +import QtQuick + +Text { + textFormat: Text.RichText + wrapMode: Text.WordWrap + width: 440 + font.pointSize: 12 + text: `<p><u style="color: green;">green with underline</u> + <span style="text-decoration: underline; text-decoration-color: green;"> + green underline</span></p> + <p><s style="background-color: lightgrey;">plain strikethrough</s> + <span style="text-decoration: line-through; text-decoration-color: orange;"> + orange strikethrough</span></p> + <p><span style="text-decoration: overline;">plain overline</span> + <span style="text-decoration: overline; text-decoration-color: red;"> + red overline</span></p>` +} +//![0] |