diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-02 16:52:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-02 16:52:15 +0200 |
| commit | 8831c9139e42e6357bf1ee84cba3b3b8041da502 (patch) | |
| tree | 73e918b8b28cef74152e1ec32d9dc869e56c7490 /src/compositor | |
| parent | 8b69d52db792c3910be53321df44b5c57baa694c (diff) | |
| parent | c1b65146f6b9ad98edea424742f7594712758377 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/client/qwaylandwindow_p.h
Change-Id: Ic4104c48267d1682bb58d6b38afc833c39515eae
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/compositor_api.pri | 1 | ||||
| -rw-r--r-- | src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index 3df061459..8dbe12ac1 100644 --- a/src/compositor/compositor_api/compositor_api.pri +++ b/src/compositor/compositor_api/compositor_api.pri @@ -17,6 +17,7 @@ HEADERS += \ compositor_api/qwaylandtouch.h \ compositor_api/qwaylandtouch_p.h \ compositor_api/qwaylandoutput.h \ + compositor_api/qwaylandoutput_p.h \ compositor_api/qwaylandoutputmode.h \ compositor_api/qwaylandoutputmode_p.h \ compositor_api/qwaylandbufferref.h \ 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: |