From 4d3167b97b8e48a9fcdb1c2b86467d75e7d669eb Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Sat, 28 Dec 2013 16:59:02 +0100 Subject: 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 --- examples/hybridshell/index.html | 4 ++-- examples/qmlapp/index.html | 4 ++-- examples/qtobject/index.html | 9 +++------ examples/standalone/index.html | 34 ++++++++++++++-------------------- 4 files changed, 21 insertions(+), 30 deletions(-) (limited to 'examples') diff --git a/examples/hybridshell/index.html b/examples/hybridshell/index.html index 23a765c..91c447a 100644 --- a/examples/hybridshell/index.html +++ b/examples/hybridshell/index.html @@ -37,7 +37,7 @@ background-image: -webkit-linear-gradient(left,#eeeeee, #cccccc) } - + 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 @@ - + diff --git a/examples/qtobject/index.html b/examples/qtobject/index.html index af2b940..4987116 100644 --- a/examples/qtobject/index.html +++ b/examples/qtobject/index.html @@ -1,7 +1,6 @@ - - + diff --git a/examples/standalone/index.html b/examples/standalone/index.html index 5efee77..a1aa3e4 100644 --- a/examples/standalone/index.html +++ b/examples/standalone/index.html @@ -2,34 +2,28 @@ - - +