From 4d3167b97b8e48a9fcdb1c2b86467d75e7d669eb Mon Sep 17 00:00:00 2001
From: Milian Wolff <milian.wolff@kdab.com>
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 <simon.hausmann@digia.com>
---
 src/webchannel/webchannel.pro | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/webchannel/webchannel.pro')

diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro
index a0041bf..376711d 100644
--- a/src/webchannel/webchannel.pro
+++ b/src/webchannel/webchannel.pro
@@ -8,8 +8,7 @@ RESOURCES += \
     resources.qrc
 
 OTHER_FILES = \
-    webchannel.js \
-    qobject.js
+    qwebchannel.js
 
 PUBLIC_HEADERS += \
     qwebchannel.h \
-- 
cgit v1.2.1