summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-05-24 10:38:41 (GMT)
committerKai Koehne <kai.koehne@nokia.com>2011-05-24 10:38:41 (GMT)
commit18464b467865cb148b219b9bbe72da9fff45b99f (patch)
treed28e68fe717296638e3a9a1307bc75a78b3898b7 /tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
parent00a72cd1f5aff15d5a3a59d61efd2f5653d7dd34 (diff)
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff)
downloadQt-18464b467865cb148b219b9bbe72da9fff45b99f.zip
Qt-18464b467865cb148b219b9bbe72da9fff45b99f.tar.gz
Qt-18464b467865cb148b219b9bbe72da9fff45b99f.tar.bz2
Merge remote-tracking branch 'qt/4.8' into master-qml-team
Diffstat (limited to 'tests/auto/declarative/qdeclarativewebview/data/javaScript.qml')
-rw-r--r--tests/auto/declarative/qdeclarativewebview/data/javaScript.qml12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml b/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
deleted file mode 100644
index 527e3b9..0000000
--- a/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 1.0
-import QtWebKit 1.0
-
-WebView {
- url: "javaScript.html"
- javaScriptWindowObjects: [
- QtObject {
- property string qmlprop: "qmlvalue"
- WebView.windowObjectName: "myjsname"
- }
- ]
-}