diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-06-05 13:21:22 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-06-05 13:21:22 +0200 |
| commit | 70d422afb8f631e14140f22b01256013b28b7034 (patch) | |
| tree | 7e2e2155cb976122a6d586a9e6d00c3210ba1f0d /src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc | |
| parent | d829ba99c862efbdb6a040627176913a8a1e3847 (diff) | |
| parent | cde2fe3fba31b9b8d258f0663bc34009fd769efd (diff) | |
Merge remote-tracking branch 'qt/5.12' into texturesharing-5.12
Change-Id: Ib8fba00f848821bfab58d33aff74ace436af204a
Diffstat (limited to 'src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc')
| -rw-r--r-- | src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc b/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc index 1dadb7102..454fc3711 100644 --- a/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc +++ b/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule QtWayland.Compositor 1.1 + \qmlmodule QtWayland.Compositor 1.3 \title Qt Wayland Compositor QML Types \ingroup qmlmodules \brief Provides QML types for writing custom Wayland display servers. @@ -38,7 +38,7 @@ import statement: \code - import QtWayland.Compositor 1.1 + import QtWayland.Compositor 1.3 \endcode To link against the module, add this line to your \l qmake \c .pro file: |