summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-19 03:34:28 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-19 03:34:28 (GMT)
commita9a2b17b8a967c001137e12af570856d9ce4b937 (patch)
treeacef06e5d0bc9c994289531925c5a442767230da /examples
parent0b991014c55d02211eee01cad44b4ca4a2edb07d (diff)
downloadQt-a9a2b17b8a967c001137e12af570856d9ce4b937.zip
Qt-a9a2b17b8a967c001137e12af570856d9ce4b937.tar.gz
Qt-a9a2b17b8a967c001137e12af570856d9ce4b937.tar.bz2
Rename QML Object to QtObject
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/webview/content/Mapping/Map.qml2
-rw-r--r--examples/declarative/webview/evalandattach.qml4
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/webview/content/Mapping/Map.qml b/examples/declarative/webview/content/Mapping/Map.qml
index 9bde031..aae6b5d 100644
--- a/examples/declarative/webview/content/Mapping/Map.qml
+++ b/examples/declarative/webview/content/Mapping/Map.qml
@@ -9,7 +9,7 @@ Item {
id: map
anchors.fill: parent
url: "map.html"
- javaScriptWindowObjects: Object {
+ javaScriptWindowObjects: QtObject {
WebView.windowObjectName: "qml"
property real lat: page.latitude
property real lng: page.longitude
diff --git a/examples/declarative/webview/evalandattach.qml b/examples/declarative/webview/evalandattach.qml
index e755819..1b211c9 100644
--- a/examples/declarative/webview/evalandattach.qml
+++ b/examples/declarative/webview/evalandattach.qml
@@ -37,12 +37,12 @@ Item {
focus: true
settings.pluginsEnabled: true
javaScriptWindowObjects: [
- Object {
+ QtObject {
id: txt
WebView.windowObjectName: "statusText1"
property string text: "Click me!"
},
- Object {
+ QtObject {
id: txt2
WebView.windowObjectName: "statusText2"
property string text: ""