diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
| commit | 7727a0288c1ffb40ecff13e7bfc49ce99b984633 (patch) | |
| tree | d94518fa3c56bdfc07f015e2acf779904dbe648d /tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml | |
| parent | 569b076bb650c5082109d6406616c7536ac9f79f (diff) | |
| parent | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff) | |
| download | Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.zip Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.gz Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml | 81 |
1 files changed, 39 insertions, 42 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml index 3a06cf0..64ab65b 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml @@ -2,40 +2,55 @@ import QtQuick 1.0 import "../../shared" 1.0 Rectangle { - id: s; width: 620; height: 600; color: "lightsteelblue" + id: s; width: 620; height: 360; color: "lightsteelblue" property string text: "Jackdaws love my big sphinx of quartz." Column { spacing: 8 TestText { - text: s.text - } - TestText { - text: s.text; font.pixelSize: 18 - } - TestText { - text: s.text; font.pointSize: 20 - } - TestText { - text: s.text; color: "red"; smooth: true - } - TestText { - text: s.text; font.capitalization: "AllUppercase" - } - TestText { - text: s.text; font.underline: true - } - TestText { - text: s.text; font.overline: true; smooth: true + text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width } TestText { - text: s.text; font.strikeout: true + font.pixelSize: 18 + text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; } TestText { - text: s.text; font.underline: true; font.overline: true; font.strikeout: true + font.pixelSize: 24 + text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; } - TestText { - text: s.text; font.letterSpacing: 2 + Grid{ + columns: 2 + spacing: 4 + TestText { + text: s.text; color: "red"; smooth: true + } + TestText { + text: s.text; font.capitalization: "AllUppercase" + } + TestText { + text: s.text; font.underline: true + } + TestText { + text: s.text; font.overline: true; smooth: true + } + TestText { + text: s.text; font.strikeout: true + } + TestText { + text: s.text; font.underline: true; font.overline: true; font.strikeout: true + } + TestText { + text: s.text; style: Text.Outline; styleColor: "white" + } + TestText { + text: s.text; style: Text.Sunken; styleColor: "gray" + } + TestText { + text: s.text; style: Text.Raised; styleColor: "yellow" + } + TestText { + text: s.text; font.letterSpacing: 2 + } } TestText { text: s.text; font.underline: true; font.letterSpacing: 2; font.capitalization: "AllUppercase"; color: "blue" @@ -43,24 +58,6 @@ Rectangle { TestText { text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green" } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white" - } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray" - } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow" - } - TestText { - text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width - } - TestText { - text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20 - } - TestText { - text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20 - } Row{ height: childrenRect.height spacing: 4 |