summaryrefslogtreecommitdiffstats
path: root/examples/declarative/webview
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-10-06 04:05:40 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-10-06 04:05:40 (GMT)
commit43199af242918b3c77bb47bdcc3ec60f8236b0d3 (patch)
tree94293b06614afbd3a2a89004204a23e7228a3d51 /examples/declarative/webview
parentb9663faad39ae02b7dbee9f2cea7dce7d25894f8 (diff)
downloadQt-43199af242918b3c77bb47bdcc3ec60f8236b0d3.zip
Qt-43199af242918b3c77bb47bdcc3ec60f8236b0d3.tar.gz
Qt-43199af242918b3c77bb47bdcc3ec60f8236b0d3.tar.bz2
lowercase ids
Diffstat (limited to 'examples/declarative/webview')
-rw-r--r--examples/declarative/webview/autosize.qml19
-rw-r--r--examples/declarative/webview/content/SpinSquare.qml12
-rw-r--r--examples/declarative/webview/newwindows.qml16
-rw-r--r--examples/declarative/webview/qml-in-html.qml6
-rw-r--r--examples/declarative/webview/transparent.qml6
5 files changed, 29 insertions, 30 deletions
diff --git a/examples/declarative/webview/autosize.qml b/examples/declarative/webview/autosize.qml
index dbd94e1..74c6844 100644
--- a/examples/declarative/webview/autosize.qml
+++ b/examples/declarative/webview/autosize.qml
@@ -3,22 +3,21 @@ import Qt 4.6
// The WebView size is determined by the width, height,
// preferredWidth, and preferredHeight properties.
Rectangle {
- id: Rect
+ id: rect
color: "white"
width: 200
- height: Layout.height
+ height: layout.height
Column {
- id: Layout
+ id: layout
spacing: 2
WebView {
html: "No width defined."
- Rectangle {
- color: "#10000000"
+ Rectangle { color: "#10000000"
anchors.fill: parent
}
}
WebView {
- width: Rect.width
+ width: rect.width
html: "The width is full."
Rectangle {
color: "#10000000"
@@ -26,7 +25,7 @@ Rectangle {
}
}
WebView {
- width: Rect.width/2
+ width: rect.width/2
html: "The width is half."
Rectangle {
color: "#10000000"
@@ -34,7 +33,7 @@ Rectangle {
}
}
WebView {
- preferredWidth: Rect.width/2
+ preferredWidth: rect.width/2
html: "The preferredWidth is half."
Rectangle {
color: "#10000000"
@@ -42,7 +41,7 @@ Rectangle {
}
}
WebView {
- preferredWidth: Rect.width/2
+ preferredWidth: rect.width/2
html: "The_preferredWidth_is_half."
Rectangle {
color: "#10000000"
@@ -50,7 +49,7 @@ Rectangle {
}
}
WebView {
- width: Rect.width/2
+ width: rect.width/2
html: "The_width_is_half."
Rectangle {
color: "#10000000"
diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml
index 95159b6..5ccdeb6 100644
--- a/examples/declarative/webview/content/SpinSquare.qml
+++ b/examples/declarative/webview/content/SpinSquare.qml
@@ -3,16 +3,16 @@ import Qt 4.6
Item {
property var period : 250
property var color : "black"
- id: Root
+ id: root
Item {
- x: Root.width/2
- y: Root.height/2
+ x: root.width/2
+ y: root.height/2
Rectangle {
- color: Root.color
+ color: root.color
x: -width/2
y: -height/2
- width: Root.width
+ width: root.width
height: width
}
rotation: NumberAnimation {
@@ -20,7 +20,7 @@ Item {
to: 360
repeat: true
running: true
- duration: Root.period
+ duration: root.period
}
}
}
diff --git a/examples/declarative/webview/newwindows.qml b/examples/declarative/webview/newwindows.qml
index 57cbf4e..59e3b3e 100644
--- a/examples/declarative/webview/newwindows.qml
+++ b/examples/declarative/webview/newwindows.qml
@@ -6,23 +6,23 @@
import Qt 4.6
Row {
- id: Pages
+ id: pages
height: 200
resources: [
Component {
- id: WebViewPage
+ id: webViewPage
Rectangle {
- width: WV.width
- height: WV.height
+ width: webView.width
+ height: webView.height
WebView {
- id: WV
- newWindowComponent: WebViewPage
- newWindowParent: Pages
+ id: webView
+ newWindowComponent: webViewPage
+ newWindowParent: pages
url: "newwindows.html"
}
}
}
]
width: 500
- Loader { sourceComponent: WebViewPage }
+ Loader { sourceComponent: webViewPage }
}
diff --git a/examples/declarative/webview/qml-in-html.qml b/examples/declarative/webview/qml-in-html.qml
index b9c8d94..43cc61b 100644
--- a/examples/declarative/webview/qml-in-html.qml
+++ b/examples/declarative/webview/qml-in-html.qml
@@ -6,10 +6,10 @@ Rectangle {
Flickable {
width: parent.width
height: parent.height/2
- viewportWidth: Web.width*Web.scale
- viewportHeight: Web.height*Web.scale
+ viewportWidth: web.width*web.scale
+ viewportHeight: web.height*web.scale
WebView {
- id: Web
+ id: web
width: 250
height: 420
scale: 0.75
diff --git a/examples/declarative/webview/transparent.qml b/examples/declarative/webview/transparent.qml
index 0807cc5..9332f3e 100644
--- a/examples/declarative/webview/transparent.qml
+++ b/examples/declarative/webview/transparent.qml
@@ -4,10 +4,10 @@ import Qt 4.6
// if the HTML does not specify a background
Rectangle {
color: "green"
- width: Web.width
- height: Web.height
+ width: web.width
+ height: web.height
WebView {
- id: Web
+ id: web
html: "Hello <b>World!</b>"
}
}