summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-08 03:04:13 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-08 03:04:13 (GMT)
commit71f9283df3caabadcfb04e2ab6f57305cd73c0d1 (patch)
tree99489117c607f5c7039d3dd8fb4d647121d23eab /examples
parente005c3048ee69be668a6b4903ce281500543d454 (diff)
downloadQt-71f9283df3caabadcfb04e2ab6f57305cd73c0d1.zip
Qt-71f9283df3caabadcfb04e2ab6f57305cd73c0d1.tar.gz
Qt-71f9283df3caabadcfb04e2ab6f57305cd73c0d1.tar.bz2
Replace Text::wrap property with Text::wrapMode enumeration.
wrap remains for a little while, and will produce a warning.
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/listview/recipes.qml6
-rw-r--r--examples/declarative/tabwidget/tabs.qml6
-rw-r--r--examples/declarative/webview/alerts.qml2
-rw-r--r--examples/declarative/xmldata/daringfireball.qml2
-rw-r--r--examples/declarative/xmldata/yahoonews.qml2
5 files changed, 10 insertions, 8 deletions
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index b76a9ab..59f4e59 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -60,7 +60,9 @@ Rectangle {
opacity: wrapper.detailsOpacity
}
Text {
- text: ingredients; wrap: true; width: parent.width
+ text: ingredients
+ wrapMode: Text.WordWrap
+ width: parent.width
opacity: wrapper.detailsOpacity
}
}
@@ -82,7 +84,7 @@ Rectangle {
id: flick
anchors.top: methodTitle.bottom; anchors.bottom: parent.bottom
width: parent.width; contentHeight: methodText.height; clip: true
- Text { id: methodText; text: method; wrap: true; width: details.width }
+ Text { id: methodText; text: method; wrapMode: Text.WordWrap; width: details.width }
}
Image {
anchors.right: flick.right; anchors.top: flick.top
diff --git a/examples/declarative/tabwidget/tabs.qml b/examples/declarative/tabwidget/tabs.qml
index 1d11b03..3d7ee6d 100644
--- a/examples/declarative/tabwidget/tabs.qml
+++ b/examples/declarative/tabwidget/tabs.qml
@@ -13,7 +13,7 @@ TabWidget {
Text {
anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
text: "Roses are red"; font.pixelSize: 20
- wrap: true; width: parent.width - 20
+ wrapMode: Text.WordWrap; width: parent.width - 20
}
}
}
@@ -27,7 +27,7 @@ TabWidget {
Text {
anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
text: "Flower stems are green"; font.pixelSize: 20
- wrap: true; width: parent.width - 20
+ wrapMode: Text.WordWrap; width: parent.width - 20
}
}
}
@@ -41,7 +41,7 @@ TabWidget {
Text {
anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
text: "Violets are blue"; font.pixelSize: 20
- wrap: true; width: parent.width - 20
+ wrapMode: Text.WordWrap; width: parent.width - 20
}
}
}
diff --git a/examples/declarative/webview/alerts.qml b/examples/declarative/webview/alerts.qml
index ab2e860..2549226 100644
--- a/examples/declarative/webview/alerts.qml
+++ b/examples/declarative/webview/alerts.qml
@@ -51,7 +51,7 @@ WebView {
color: "white"
font.pixelSize: 20
width: webView.width*0.75
- wrap: true
+ wrapMode: Text.WordWrap
horizontalAlignment: "AlignHCenter"
}
}
diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml
index 456f309..25eb1ac 100644
--- a/examples/declarative/xmldata/daringfireball.qml
+++ b/examples/declarative/xmldata/daringfireball.qml
@@ -32,7 +32,7 @@ Rectangle {
x: 10
text: content
anchors.top: titleText.bottom
- width: 580; wrap: true
+ width: 580; wrapMode: Text.WordWrap
onLinkActivated: { console.log('link clicked: ' + link) }
}
}
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index f7c269c..d69982e 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -45,7 +45,7 @@ Rectangle {
id: descriptionText
text: description
width: 560
- wrap: true
+ wrapMode: Text.WordWrap
font.family: "Helvetica"
anchors.top: titleText.bottom
anchors.topMargin: 5