diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:02:51 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:02:51 +0200 |
| commit | 6dd15c9f1bfdc010e4cd4b8158435063a5a7d229 (patch) | |
| tree | fee52a5b7934d40eb242d4c8ccac52cead86ee45 /src/websockets | |
| parent | 0a7edabaac66481fd7f92b0a276d211ad9339f20 (diff) | |
| parent | 74c8ebe9696c981311f19bdd6544634ab1b7cc7f (diff) | |
| download | qtwebsockets-6dd15c9f1bfdc010e4cd4b8158435063a5a7d229.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I43320389826b0f0deac412bf37df9232f2e68a33
Diffstat (limited to 'src/websockets')
| -rw-r--r-- | src/websockets/doc/src/index.qdoc | 6 | ||||
| -rw-r--r-- | src/websockets/doc/src/qtwebsockets-module.qdoc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/websockets/doc/src/index.qdoc b/src/websockets/doc/src/index.qdoc index c23f6fe..81a2cb4 100644 --- a/src/websockets/doc/src/index.qdoc +++ b/src/websockets/doc/src/index.qdoc @@ -51,9 +51,9 @@ To import the QML types into your application, use the following import statement in your .qml file: - \code - import QtWebSockets 1.0 - \endcode + \qml \QtMinorVersion + import QtWebSockets 1.\1 + \endqml To link against the module, add this line to your qmake .pro file: diff --git a/src/websockets/doc/src/qtwebsockets-module.qdoc b/src/websockets/doc/src/qtwebsockets-module.qdoc index c1f7958..83c561d 100644 --- a/src/websockets/doc/src/qtwebsockets-module.qdoc +++ b/src/websockets/doc/src/qtwebsockets-module.qdoc @@ -48,16 +48,16 @@ */ /*! - \qmlmodule QtWebSockets 1.1 + \qmlmodule QtWebSockets 1.\QtMinorVersion \title Qt WebSockets QML Types \ingroup qmlmodules \brief Provides QML types for WebSocket-based communication. The QML types are accessed by using: - \code - import QtWebSockets 1.1 - \endcode + \qml \QtMinorVersion + import QtWebSockets 1.\1 + \endqml \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 |