diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2018-01-30 10:37:24 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2018-01-31 10:29:53 +0100 |
| commit | 6c1499b227324e29cece5651fa00c812d9e01709 (patch) | |
| tree | db9ce6e6bc8c605bd54514954b91b73834249b6f /src/compositor/compositor_api/qwaylandoutput.cpp | |
| parent | 7a9d0f9d0a852c727aef5a54ceeb51b7b2dda85d (diff) | |
| parent | 06230d22488796d92ea130e985d1e0ee2ed05199 (diff) | |
| download | qtwayland-6c1499b227324e29cece5651fa00c812d9e01709.tar.gz | |
Merge remote-tracking branch 'qt/5.10' into dev
Change-Id: I603cbb164e6015c1bb7796bd8bb055d84dbc3b04
Diffstat (limited to 'src/compositor/compositor_api/qwaylandoutput.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index f57b8bb5..9cbf80fd 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -838,7 +838,7 @@ void QWaylandOutput::setSizeFollowsWindow(bool follow) } /*! - * \qmlproperty object QtWaylandCompositor::WaylandOutput::window + * \qmlproperty Window QtWaylandCompositor::WaylandOutput::window * * This property holds the Window for this WaylandOutput. * |