diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 08:24:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 08:24:05 (GMT) |
| commit | e2f90ecdde9550986df1539aa88eb5fc41d939e1 (patch) | |
| tree | 354e192d83d1ed695373f085faa3a448e2599713 /examples/declarative/webview/evalandattach.html | |
| parent | 69b1784edb6dd82f26100d0e539bfa8a65bdd35d (diff) | |
| parent | 33eb76f050b45718d87926a8ff7afc89d6201c16 (diff) | |
| download | Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.zip Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.tar.gz Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Replace QmlList* and QList* support with a single QmlListProperty type
Rename MouseRegion -> MouseArea
Update QmlChanges with animation API changes.
Document the default velocity of EaseFollow
Remove use of unexprted private classes.
Fix compile error on Solaris
Increase durations when testing Behaviors.
Add cached path rounded rect painting benchmark.
Remove use of direct event posting. Use QTest::keyClick() for keys.
Diffstat (limited to 'examples/declarative/webview/evalandattach.html')
| -rw-r--r-- | examples/declarative/webview/evalandattach.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/webview/evalandattach.html b/examples/declarative/webview/evalandattach.html index c0992bb..48a1c33 100644 --- a/examples/declarative/webview/evalandattach.html +++ b/examples/declarative/webview/evalandattach.html @@ -1,7 +1,7 @@ <body bgcolor=gray onload="ftext.confirmed.connect (ftext_confirmed); "> <script> do_it = function () {var oPressed = document.getElementById('pressed'); - oPressed.innerHTML = 'MouseRegion in QML clicked!';}; + oPressed.innerHTML = 'MouseArea in QML clicked!';}; ftext_confirmed = function () { statusText1.text = ftext.text; var oT = document.getElementById('htmlTextInput'); oT.value = ftext.text } </script> <table border=1> |