aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qsgtext/data
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-10-14 10:51:42 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 11:53:26 +0200
commitbfb3c424abc7c839dc44de0e36024ede99ece736 (patch)
treeb6814d0238bead8518b23c078beb818432de6ce4 /tests/auto/declarative/qsgtext/data
parent2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff)
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qsgtext/data')
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments.qml41
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_cb.pngbin496 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_cc.pngbin556 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_ct.pngbin533 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_lb.pngbin496 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_lc.pngbin535 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_lt.pngbin514 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_rb.pngbin505 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_rc.pngbin559 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/alignments_rt.pngbin539 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/embeddedImagesLocal.qml6
-rw-r--r--tests/auto/declarative/qsgtext/data/embeddedImagesLocalError.qml6
-rw-r--r--tests/auto/declarative/qsgtext/data/embeddedImagesRemote.qml6
-rw-r--r--tests/auto/declarative/qsgtext/data/embeddedImagesRemoteError.qml6
-rw-r--r--tests/auto/declarative/qsgtext/data/horizontalAlignment_RightToLeft.qml23
-rw-r--r--tests/auto/declarative/qsgtext/data/http/exists.pngbin2738 -> 0 bytes
-rw-r--r--tests/auto/declarative/qsgtext/data/lineCount.qml15
-rw-r--r--tests/auto/declarative/qsgtext/data/lineHeight.qml15
-rw-r--r--tests/auto/declarative/qsgtext/data/lineLayout.qml35
-rw-r--r--tests/auto/declarative/qsgtext/data/qtbug_14734.qml10
-rw-r--r--tests/auto/declarative/qsgtext/data/rotated.qml18
21 files changed, 0 insertions, 181 deletions
diff --git a/tests/auto/declarative/qsgtext/data/alignments.qml b/tests/auto/declarative/qsgtext/data/alignments.qml
deleted file mode 100644
index 9798d9c736..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- id: top
- width: 70; height: 70;
-
- property alias horizontalAlignment: t.horizontalAlignment
- property alias verticalAlignment: t.verticalAlignment
- property alias wrapMode: t.wrapMode
- property alias running: timer.running
- property string txt: "Test"
-
- Rectangle {
- anchors.centerIn: parent
- width: 40
- height: 40
- color: "green"
-
- Text {
- id: t
-
- anchors.fill: parent
- horizontalAlignment: Text.AlignRight
- verticalAlignment: Text.AlignBottom
- wrapMode: Text.WordWrap
- text: top.txt
- }
- Timer {
- id: timer
-
- interval: 1
- running: true
- repeat: true
- onTriggered: {
- top.txt = top.txt + "<br>more " + top.txt.length;
- if (top.txt.length > 50)
- running = false
- }
- }
- }
-}
diff --git a/tests/auto/declarative/qsgtext/data/alignments_cb.png b/tests/auto/declarative/qsgtext/data/alignments_cb.png
deleted file mode 100644
index cf6199a418..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_cb.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_cc.png b/tests/auto/declarative/qsgtext/data/alignments_cc.png
deleted file mode 100644
index f81ccb4238..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_cc.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_ct.png b/tests/auto/declarative/qsgtext/data/alignments_ct.png
deleted file mode 100644
index 9ba64125d5..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_ct.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_lb.png b/tests/auto/declarative/qsgtext/data/alignments_lb.png
deleted file mode 100644
index 1b50a81f3d..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_lb.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_lc.png b/tests/auto/declarative/qsgtext/data/alignments_lc.png
deleted file mode 100644
index f041b868f8..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_lc.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_lt.png b/tests/auto/declarative/qsgtext/data/alignments_lt.png
deleted file mode 100644
index c75e0d158e..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_lt.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_rb.png b/tests/auto/declarative/qsgtext/data/alignments_rb.png
deleted file mode 100644
index b06a5da715..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_rb.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_rc.png b/tests/auto/declarative/qsgtext/data/alignments_rc.png
deleted file mode 100644
index e468857cd0..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_rc.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/alignments_rt.png b/tests/auto/declarative/qsgtext/data/alignments_rt.png
deleted file mode 100644
index 576715ffce..0000000000
--- a/tests/auto/declarative/qsgtext/data/alignments_rt.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/embeddedImagesLocal.qml b/tests/auto/declarative/qsgtext/data/embeddedImagesLocal.qml
deleted file mode 100644
index 74b2ab817a..0000000000
--- a/tests/auto/declarative/qsgtext/data/embeddedImagesLocal.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Text {
- textFormat: Text.RichText
- text: "<img src='http/exists.png'>"
-}
diff --git a/tests/auto/declarative/qsgtext/data/embeddedImagesLocalError.qml b/tests/auto/declarative/qsgtext/data/embeddedImagesLocalError.qml
deleted file mode 100644
index a2f7e0c89f..0000000000
--- a/tests/auto/declarative/qsgtext/data/embeddedImagesLocalError.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Text {
- textFormat: Text.RichText
- text: "<img src='http/notexists.png'>"
-}
diff --git a/tests/auto/declarative/qsgtext/data/embeddedImagesRemote.qml b/tests/auto/declarative/qsgtext/data/embeddedImagesRemote.qml
deleted file mode 100644
index 702633c538..0000000000
--- a/tests/auto/declarative/qsgtext/data/embeddedImagesRemote.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Text {
- textFormat: Text.RichText
- text: "<img src='http://127.0.0.1:14453/exists.png'>"
-}
diff --git a/tests/auto/declarative/qsgtext/data/embeddedImagesRemoteError.qml b/tests/auto/declarative/qsgtext/data/embeddedImagesRemoteError.qml
deleted file mode 100644
index 5762f3e47d..0000000000
--- a/tests/auto/declarative/qsgtext/data/embeddedImagesRemoteError.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-Text {
- textFormat: Text.RichText
- text: "<img src='http://127.0.0.1:14453/notexists.png'>"
-}
diff --git a/tests/auto/declarative/qsgtext/data/horizontalAlignment_RightToLeft.qml b/tests/auto/declarative/qsgtext/data/horizontalAlignment_RightToLeft.qml
deleted file mode 100644
index 5ba4d35684..0000000000
--- a/tests/auto/declarative/qsgtext/data/horizontalAlignment_RightToLeft.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- id: top
- width: 200; height: 70;
-
- property alias horizontalAlignment: text.horizontalAlignment
- property string text: "اختبا"
-
- Rectangle {
- anchors.centerIn: parent
- width: 180
- height: 20
- color: "green"
-
- Text {
- id: text
- objectName: "text"
- anchors.fill: parent
- text: top.text
- }
- }
-}
diff --git a/tests/auto/declarative/qsgtext/data/http/exists.png b/tests/auto/declarative/qsgtext/data/http/exists.png
deleted file mode 100644
index 399bd0b1d9..0000000000
--- a/tests/auto/declarative/qsgtext/data/http/exists.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qsgtext/data/lineCount.qml b/tests/auto/declarative/qsgtext/data/lineCount.qml
deleted file mode 100644
index b672863684..0000000000
--- a/tests/auto/declarative/qsgtext/data/lineCount.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick 2.0
-
-Item {
- width: 200
- height: 200
-
- Text {
- id: myText
- objectName: "myText"
- width: 200
- wrapMode: Text.WordWrap
- maximumLineCount: undefined
- text: "Testing that maximumLines, visibleLines, and totalLines works properly in the autotests. The quick brown fox jumped over the lazy anything with the letter 'g'."
- }
-}
diff --git a/tests/auto/declarative/qsgtext/data/lineHeight.qml b/tests/auto/declarative/qsgtext/data/lineHeight.qml
deleted file mode 100644
index c1f337aa05..0000000000
--- a/tests/auto/declarative/qsgtext/data/lineHeight.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick 2.0
-
-Item {
- width: 200
- height: 200
-
- Text {
- id: myText
- objectName: "myText"
- width: 200
- wrapMode: Text.WordWrap
- font.pixelSize: 13
- text: "Lorem ipsum sit amet, consectetur adipiscing elit. Integer felis nisl, varius in pretium nec, venenatis non erat. Proin lobortis interdum dictum."
- }
-}
diff --git a/tests/auto/declarative/qsgtext/data/lineLayout.qml b/tests/auto/declarative/qsgtext/data/lineLayout.qml
deleted file mode 100644
index cb2474791e..0000000000
--- a/tests/auto/declarative/qsgtext/data/lineLayout.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- id: main
- width: 800; height: 600
-
- property real off: 0
-
- Text {
- id: myText
- objectName: "myText"
- wrapMode: Text.WordWrap
- font.pixelSize: 14
- textFormat: Text.StyledText
- focus: true
-
- text: "<b>Lorem ipsum</b> dolor sit amet, consectetur adipiscing elit. Integer at ante dui. Sed eu egestas est.
- <br/><p><i>Maecenas nec libero leo. Sed ac leo eget ipsum ultricies viverra sit amet eu orci. Praesent et tortor risus, viverra accumsan sapien. Sed faucibus eleifend lectus, sed euismod urna porta eu. Aenean ultricies lectus ut orci dictum quis convallis nisi ultrices. Nunc elit mi, iaculis a porttitor rutrum, venenatis malesuada nisi. Suspendisse turpis quam, euismod non imperdiet et, rutrum nec ligula. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam semper tristique metus eu sodales. Integer eget risus ipsum. Quisque ut risus ut nulla tristique volutpat at sit amet nisl. Aliquam pulvinar auctor diam nec bibendum.</i><br/><p>Quisque luctus sapien id arcu volutpat pharetra. Praesent pretium imperdiet euismod. Integer fringilla rhoncus condimentum. Quisque sit amet ornare nulla. Cras sapien augue, sagittis a dictum id, suscipit et nunc. Cras vitae augue in enim elementum venenatis sed nec risus. Sed nisi quam, mollis quis auctor ac, vestibulum in neque. Vivamus eu justo risus. Suspendisse vel mollis est. Vestibulum gravida interdum mi, in molestie neque gravida in. Donec nibh odio, mattis facilisis vulputate et, scelerisque ut felis. Sed ornare eros nec odio aliquam eu varius augue adipiscing. Vivamus sit amet massa dapibus sapien pulvinar consectetur a sit amet felis. Cras non mi id libero dictum iaculis id dignissim eros. Praesent eget enim dui, sed bibendum neque. Ut interdum nisl id leo malesuada ornare. Pellentesque id nisl eu odio volutpat posuere et at massa. Pellentesque nec lorem justo. Integer sem urna, pharetra sed sagittis vitae, condimentum ac felis. Ut vitae sapien ac tortor adipiscing pharetra. Cras tristique urna tempus ante volutpat eleifend non eu ligula. Mauris sodales nisl et lorem tristique sodales. Mauris arcu orci, vehicula semper cursus ac, dapibus ut mi."
-
- onLineLaidOut: {
- line.width = line.number * 15
- if (line.number === 30 || line.number === 60) {
- main.off = line.y
- }
- if (line.number >= 30) {
- line.x = line.width + 30
- line.y -= main.off
- }
- if (line.number >= 60) {
- line.x = line.width * 2 + 60
- line.height = 20
- }
- }
- }
-}
diff --git a/tests/auto/declarative/qsgtext/data/qtbug_14734.qml b/tests/auto/declarative/qsgtext/data/qtbug_14734.qml
deleted file mode 100644
index e71a798421..0000000000
--- a/tests/auto/declarative/qsgtext/data/qtbug_14734.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- width: 640
- height: 480
-
- Text {
- text: "í "
- }
-}
diff --git a/tests/auto/declarative/qsgtext/data/rotated.qml b/tests/auto/declarative/qsgtext/data/rotated.qml
deleted file mode 100644
index fecf64b249..0000000000
--- a/tests/auto/declarative/qsgtext/data/rotated.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
- width : 200
- height : 100
-
- Text {
- objectName: "text"
- x: 20
- y: 20
- height : 20
- width : 80
- text : "Something"
- rotation : 30
- transformOrigin : Item.TopLeft
- }
-}
-