From 88dd8bc7e0365d0b0846b97d60c74370452f13b3 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Fri, 22 May 2015 07:47:53 +0800 Subject: Doc: Document the changes to the QML import statement The changes happened in 759b6b12489b68fcbd755398ff9337acefb035a0 [ChangeLog][QML] The import statement has changed from "import Qt.WebSockets 1.0" to "import QtWebSockets 1.0". The old statement is still supported, but it cannot be mixed with the new statement within the same project. Change-Id: I95d75e4a87133c452d2ea43c42593415de882c9b Reviewed-by: Liang Qi Reviewed-by: Alex Blasche --- src/websockets/doc/src/qtwebsockets-module.qdoc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/websockets/doc/src/qtwebsockets-module.qdoc b/src/websockets/doc/src/qtwebsockets-module.qdoc index acbe2ac..6c717f4 100644 --- a/src/websockets/doc/src/qtwebsockets-module.qdoc +++ b/src/websockets/doc/src/qtwebsockets-module.qdoc @@ -58,4 +58,9 @@ \code import QtWebSockets 1.0 \endcode + + \note Prior to Qt 5.5, the import statement was \c{import Qt.WebSockets 1.0} + (notice the dot between \c Qt and \c WebSockets). The old statement is still + supported for backwards compatibility, but it cannot be mixed with the new + statement within the same project. */ -- cgit v1.2.1