diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2013-12-28 16:59:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 15:04:48 +0100 |
| commit | 4d3167b97b8e48a9fcdb1c2b86467d75e7d669eb (patch) | |
| tree | 0e335790074632bf05d62f276e9334ba54a41926 /src/webchannel/resources.qrc | |
| parent | a5d8d21e5ff33b88c15f4767b3a0d04ad4dbed7a (diff) | |
| download | qtwebchannel-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 'src/webchannel/resources.qrc')
| -rw-r--r-- | src/webchannel/resources.qrc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/webchannel/resources.qrc b/src/webchannel/resources.qrc index 821e911..30a3e96 100644 --- a/src/webchannel/resources.qrc +++ b/src/webchannel/resources.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/qwebchannel/"> - <file>webchannel.js</file> - <file>qobject.js</file> + <file>qwebchannel.js</file> </qresource> </RCC> |