From bd1f5e1651c7cdaa712feebe2573dd158c87bb07 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 20 May 2015 14:37:58 +0200 Subject: 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 --- examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml | 2 +- examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') 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 -- cgit v1.2.1