aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktext/data
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick/qquicktext/data')
-rw-r--r--tests/auto/quick/qquicktext/data/fontSizeMode.qml2
-rw-r--r--tests/auto/quick/qquicktext/data/multilengthStrings.qml2
-rw-r--r--tests/auto/quick/qquicktext/data/multilengthStringsWrapped.qml2
-rw-r--r--tests/auto/quick/qquicktext/data/multilineelide.qml2
-rw-r--r--tests/auto/quick/qquicktext/data/pixelFontSizes.qml21
-rw-r--r--tests/auto/quick/qquicktext/data/pointFontSizes.qml21
6 files changed, 45 insertions, 5 deletions
diff --git a/tests/auto/quick/qquicktext/data/fontSizeMode.qml b/tests/auto/quick/qquicktext/data/fontSizeMode.qml
index 20f7535365..84f7ce8d50 100644
--- a/tests/auto/quick/qquicktext/data/fontSizeMode.qml
+++ b/tests/auto/quick/qquicktext/data/fontSizeMode.qml
@@ -19,6 +19,4 @@ Item {
font.pixelSize: 30
font.family: "Helvetica"
}
-
- TextInput { focus: true; objectName: "input" }
}
diff --git a/tests/auto/quick/qquicktext/data/multilengthStrings.qml b/tests/auto/quick/qquicktext/data/multilengthStrings.qml
index d26576eacd..6b9dc71fbc 100644
--- a/tests/auto/quick/qquicktext/data/multilengthStrings.qml
+++ b/tests/auto/quick/qquicktext/data/multilengthStrings.qml
@@ -7,7 +7,7 @@ Item {
Text {
id: myText
objectName: "myText"
- width: 100
+ width: 60
font.pixelSize: 15
font.family: "Helvetica"
}
diff --git a/tests/auto/quick/qquicktext/data/multilengthStringsWrapped.qml b/tests/auto/quick/qquicktext/data/multilengthStringsWrapped.qml
index 0da9bc353a..21f1b20619 100644
--- a/tests/auto/quick/qquicktext/data/multilengthStringsWrapped.qml
+++ b/tests/auto/quick/qquicktext/data/multilengthStringsWrapped.qml
@@ -7,7 +7,7 @@ Item {
Text {
id: myText
objectName: "myText"
- width: 100
+ width: 60
height: 36
font.pixelSize: 15
font.family: "Helvetica"
diff --git a/tests/auto/quick/qquicktext/data/multilineelide.qml b/tests/auto/quick/qquicktext/data/multilineelide.qml
index f3bb65775b..ffca0d638a 100644
--- a/tests/auto/quick/qquicktext/data/multilineelide.qml
+++ b/tests/auto/quick/qquicktext/data/multilineelide.qml
@@ -1,7 +1,7 @@
import QtQuick 2.0
Text {
- width: 200; height: 200
+ width: 200
wrapMode: Text.WordWrap
elide: Text.ElideRight
maximumLineCount: 3
diff --git a/tests/auto/quick/qquicktext/data/pixelFontSizes.qml b/tests/auto/quick/qquicktext/data/pixelFontSizes.qml
new file mode 100644
index 0000000000..e3d81b682e
--- /dev/null
+++ b/tests/auto/quick/qquicktext/data/pixelFontSizes.qml
@@ -0,0 +1,21 @@
+import QtQuick 2.0
+
+Rectangle {
+ width: 400
+ height: 200
+
+ property variant pixelSize: 6
+
+ Text {
+ objectName: "text"
+ font.pixelSize: parent.pixelSize
+ text: "This is<br/>a font<br/> size test."
+ }
+
+ Text {
+ x: 200
+ objectName: "textWithTag"
+ font.pixelSize: parent.pixelSize
+ text: "This is <h4>a font</h4> size test."
+ }
+}
diff --git a/tests/auto/quick/qquicktext/data/pointFontSizes.qml b/tests/auto/quick/qquicktext/data/pointFontSizes.qml
new file mode 100644
index 0000000000..6feb8fecf8
--- /dev/null
+++ b/tests/auto/quick/qquicktext/data/pointFontSizes.qml
@@ -0,0 +1,21 @@
+import QtQuick 2.0
+
+Rectangle {
+ width: 400
+ height: 200
+
+ property variant pointSize: 6
+
+ Text {
+ objectName: "text"
+ font.pointSize: parent.pointSize
+ text: "This is<br/>a font<br/> size test."
+ }
+
+ Text {
+ x: 200
+ objectName: "textWithTag"
+ font.pointSize: parent.pointSize
+ text: "This is <h4>a font</h4> size test."
+ }
+}