diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-05-07 03:01:52 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-05-07 12:39:12 +0200 |
| commit | 17b1705ce4c8bc9ca19a6b424a00a045134b3aac (patch) | |
| tree | 03e7b7d461064dd007179cd29da9c024e6c8f190 /src/compositor/compositor_api/qwaylandquickitem.cpp | |
| parent | 4ab3cbcc5c4da6384e9081993c5ba24303a382bd (diff) | |
| parent | a658a10f6a42e67bd762f87851c23cc1c1e3b141 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/client/qwaylanddisplay_p.h
src/client/qwaylandwindow.cpp
Change-Id: I50eb5c83a8b81e4bdb032b68d41f429b17d0a74d
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 9e681dc0f..996177be4 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -840,7 +840,6 @@ void QWaylandQuickItem::setOutput(QWaylandOutput *output) * * The default is false. */ - /*! * \property QWaylandQuickItem::bufferLocked * |