diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-02 03:03:53 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-07-02 08:52:03 +0200 |
| commit | bd5c03712cc0c3049479ee3636f0d795014d3f04 (patch) | |
| tree | 689174ad3f7daea1263b1c5ac6d7cd8b773a9986 /src/compositor | |
| parent | 9822df545cf1aaad684cb6179b214952a4027b71 (diff) | |
| parent | a640a8d46afa6c096013c8656c3ebebe1701e551 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
src/client/qwaylanddatadevice.cpp
Change-Id: I1cc8640b68eba5dfb560749dfe679741ee62e6ad
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgdecorationv1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp index 2d283ddf9..a58601cd4 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp +++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE } \endqml - \sa XdgToplevel::decorationMode + \sa QWaylandXdgToplevel::decorationMode */ /*! |