diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:51:51 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:51:51 +0100 |
commit | 87fa7c4c42e00572f0fc8349cb2d4c969bda8ed9 (patch) | |
tree | 66a867342788fca60fc6eb129a97f4787ccc4df6 /src | |
parent | f195b7db8a206a6aad7734db24d611b8f9594aa1 (diff) | |
parent | 2e61283f7999f3d518dfc421f1298ace59e833bd (diff) | |
download | qtwayland-87fa7c4c42e00572f0fc8349cb2d4c969bda8ed9.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If50dbe8e959ba8833551cb9db4f3b69cc342b202
Diffstat (limited to 'src')
-rw-r--r-- | src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc b/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc index a89e07d7..255f49a4 100644 --- a/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc +++ b/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc @@ -39,7 +39,7 @@ \qml \QtMinorVersion import QtWayland.Compositor 1.\1 - \endcode + \endqml To link against the module, add this line to your \l qmake \c .pro file: |