diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-16 13:49:35 +0200 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2014-07-17 14:37:21 +0200 |
| commit | 324679e554561828ae1ddd0604913d12b3e150d4 (patch) | |
| tree | 79f6e66708cacdfc24a0ec71e9325c50110ca9b8 | |
| parent | 003596fad52690127afca0d7025b62bad7fd013e (diff) | |
Adapt to rename to QtWebChannel and rename resource path as well.
This is a minor cleanup commit. Renaming the .pro file is required
for qt.pro to find it. The rename of the resource path makes it more
explicit by using the module name.
Change-Id: Ib724882d02d2a8aea7468ef984ed573dca1d3e7b
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | qtwebchannel.pro (renamed from qwebchannel.pro) | 0 | ||||
| -rw-r--r-- | src/webchannel/resources.qrc | 2 | ||||
| -rw-r--r-- | tests/auto/qml/Client.qml | 2 | ||||
| -rw-r--r-- | tests/auto/qml/tst_bench.qml | 1 | ||||
| -rw-r--r-- | tests/auto/qml/tst_metaobjectpublisher.qml | 2 | ||||
| -rw-r--r-- | tests/auto/qml/tst_multiclient.qml | 1 | ||||
| -rw-r--r-- | tests/auto/qml/tst_webchannel.qml | 1 |
7 files changed, 3 insertions, 6 deletions
diff --git a/qwebchannel.pro b/qtwebchannel.pro index 58c33f2..58c33f2 100644 --- a/qwebchannel.pro +++ b/qtwebchannel.pro diff --git a/src/webchannel/resources.qrc b/src/webchannel/resources.qrc index 30a3e96..319c07a 100644 --- a/src/webchannel/resources.qrc +++ b/src/webchannel/resources.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/qwebchannel/"> + <qresource prefix="/qtwebchannel/"> <file>qwebchannel.js</file> </qresource> </RCC> diff --git a/tests/auto/qml/Client.qml b/tests/auto/qml/Client.qml index 2a47395..3a60235 100644 --- a/tests/auto/qml/Client.qml +++ b/tests/auto/qml/Client.qml @@ -44,7 +44,7 @@ import QtTest 1.0 import QtWebChannel 1.0 import QtWebChannel.Tests 1.0 -import "qrc:///qwebchannel/qwebchannel.js" as Client +import "qrc:///qtwebchannel/qwebchannel.js" as Client Item { TestTransport { diff --git a/tests/auto/qml/tst_bench.qml b/tests/auto/qml/tst_bench.qml index e1354d7..6e6d0ef 100644 --- a/tests/auto/qml/tst_bench.qml +++ b/tests/auto/qml/tst_bench.qml @@ -44,7 +44,6 @@ import QtTest 1.0 import QtWebChannel 1.0 import QtWebChannel.Tests 1.0 -import "qrc:///qwebchannel/qwebchannel.js" as Client TestCase { name: "Bench" diff --git a/tests/auto/qml/tst_metaobjectpublisher.qml b/tests/auto/qml/tst_metaobjectpublisher.qml index 62b9866..52e1f09 100644 --- a/tests/auto/qml/tst_metaobjectpublisher.qml +++ b/tests/auto/qml/tst_metaobjectpublisher.qml @@ -44,7 +44,7 @@ import QtTest 1.0 import QtWebChannel 1.0 import QtWebChannel.Tests 1.0 -import "qrc:///qwebchannel/qwebchannel.js" as Client +import "qrc:///qtwebchannel/qwebchannel.js" as Client TestCase { name: "MetaObjectPublisher" diff --git a/tests/auto/qml/tst_multiclient.qml b/tests/auto/qml/tst_multiclient.qml index 739ace7..bca2a03 100644 --- a/tests/auto/qml/tst_multiclient.qml +++ b/tests/auto/qml/tst_multiclient.qml @@ -44,7 +44,6 @@ import QtTest 1.0 import QtWebChannel 1.0 import QtWebChannel.Tests 1.0 -import "qrc:///qwebchannel/qwebchannel.js" as Client TestCase { name: "MultiClient" diff --git a/tests/auto/qml/tst_webchannel.qml b/tests/auto/qml/tst_webchannel.qml index 0443802..53c2b38 100644 --- a/tests/auto/qml/tst_webchannel.qml +++ b/tests/auto/qml/tst_webchannel.qml @@ -44,7 +44,6 @@ import QtTest 1.0 import QtWebChannel 1.0 import QtWebChannel.Tests 1.0 -import "qrc:///qwebchannel/qwebchannel.js" as Client TestCase { name: "WebChannel" |