diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-20 14:37:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-22 07:13:36 +0000 |
| commit | bd1f5e1651c7cdaa712feebe2573dd158c87bb07 (patch) | |
| tree | 63f3d142ee8c8818ea9e258749fedf498e05d265 /examples/websockets | |
| parent | faab6ff98dafa564f2c58bd95689ffba6d3a4e32 (diff) | |
| download | qtwebsockets-bd1f5e1651c7cdaa712feebe2573dd158c87bb07.tar.gz | |
Fix qmldir for qmlwebsockets_compat
It is not supported to have both "import Qt.WebSockets 1.0" and
"import QtWebSockets 1.0" in the same project.
Task-number: QTBUG-46205
Change-Id: I71b824b091f4491b8ab5e1eae8290a51159b03e2
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/websockets')
| -rw-r--r-- | examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml | 2 | ||||
| -rw-r--r-- | examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml b/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml index 6d2749c..35d64e0 100644 --- a/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml +++ b/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import Qt.WebSockets 1.0 +import QtWebSockets 1.0 Rectangle { width: 360 diff --git a/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml b/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml index 6c3433f..c0178ba 100644 --- a/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml +++ b/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml @@ -32,7 +32,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.WebSockets 1.0 +import QtWebSockets 1.0 Rectangle { width: 360 |