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 --- src/imports/qmlwebsockets_compat/qmldir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/imports/qmlwebsockets_compat/qmldir b/src/imports/qmlwebsockets_compat/qmldir index 8541103..eca44f0 100644 --- a/src/imports/qmlwebsockets_compat/qmldir +++ b/src/imports/qmlwebsockets_compat/qmldir @@ -1,4 +1,4 @@ module Qt.WebSockets -plugin ../../QtWebSockets/declarative_qmlwebsockets +plugin declarative_qmlwebsockets ../../QtWebSockets/ classname QtWebSocketsDeclarativeModule typeinfo ../../QtWebSockets/plugins.qmltypes -- cgit v1.2.1