summaryrefslogtreecommitdiff
path: root/examples/qmlapp/index.html
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2013-12-28 16:59:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-08 15:04:48 +0100
commit4d3167b97b8e48a9fcdb1c2b86467d75e7d669eb (patch)
tree0e335790074632bf05d62f276e9334ba54a41926 /examples/qmlapp/index.html
parenta5d8d21e5ff33b88c15f4767b3a0d04ad4dbed7a (diff)
downloadqtwebchannel-4d3167b97b8e48a9fcdb1c2b86467d75e7d669eb.tar.gz
Simplify QWebChannel usage by merging webchannel.js and qobject.js.
The code now resides in a single qwebchannel.js file and there is only a single callback-nesting required to setup a MetaObjectPublisher connection. The server-side will be simplified in the next step. Change-Id: Ib5fc77a03c2b281c61af91713411eed571ec6108 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'examples/qmlapp/index.html')
-rw-r--r--examples/qmlapp/index.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qmlapp/index.html b/examples/qmlapp/index.html
index 6601fa2..b3b8bb1 100644
--- a/examples/qmlapp/index.html
+++ b/examples/qmlapp/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <script type="text/javascript" src="qrc:///qwebchannel/webchannel.js"></script>
+ <script type="text/javascript" src="qrc:///qwebchannel/qwebchannel.js"></script>
<script type="text/javascript">
function output(x)
{
@@ -25,7 +25,7 @@
);
};
window.send();
- });
+ }, true);
};
</script>
</head>