diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:42:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:42:45 +0200 |
| commit | 04f6ff77ef0c8858629766e191ecc3d4ef056848 (patch) | |
| tree | d3684e21bf277bdd2b0d284042d627d97ad528db /src/compositor/extensions/qwaylandshell.cpp | |
| parent | a81fc596a3cbcc07396be1c0284f1ee8aa44ff8c (diff) | |
| parent | 00a99e631459eb7e52fde822c24d7b9d603008c4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1
Change-Id: I83392c13a9cea972fbb570a9510a19f401675283
Diffstat (limited to 'src/compositor/extensions/qwaylandshell.cpp')
| -rw-r--r-- | src/compositor/extensions/qwaylandshell.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/compositor/extensions/qwaylandshell.cpp b/src/compositor/extensions/qwaylandshell.cpp index 836407d36..adb5827d4 100644 --- a/src/compositor/extensions/qwaylandshell.cpp +++ b/src/compositor/extensions/qwaylandshell.cpp @@ -58,12 +58,6 @@ QWaylandShell::QWaylandShell(QWaylandObject *waylandObject) } /*! - * \qmlproperty enum QtWaylandCompositor::Shell::focusPolicy - * - * This property holds the focus policy of the Shell. - */ - -/*! * \enum QWaylandShell::FocusPolicy * * This enum type is used to specify the focus policy for shell surfaces. @@ -73,7 +67,7 @@ QWaylandShell::QWaylandShell(QWaylandObject *waylandObject) */ /*! - * \qmlproperty object QtWaylandCompositor::Shell::focusPolicy + * \qmlproperty enumeration QtWaylandCompositor::Shell::focusPolicy * * This property holds the focus policy of the Shell. */ |