diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:10:03 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:10:09 +0200 |
| commit | ac80dfb5b921437b699a992d1f211e8edf4d7844 (patch) | |
| tree | ecdf51ad3503454494534b02e8cea0364c93bfc7 /src/client/qwaylandwindow_p.h | |
| parent | 481cea71043dabf6d5ff33101a66693af86438e1 (diff) | |
| parent | 1006fd8b4b92856c90fdd2d0df257e9b09c3f762 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index ec9bd7d02..717709938 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -53,6 +53,8 @@ #include <QtCore/QWaitCondition> #include <QtCore/QMutex> +#include <QtCore/QReadWriteLock> + #include <QtGui/QIcon> #include <QtCore/QVariant> #include <QtCore/QLoggingCategory> @@ -276,6 +278,8 @@ private: static QMutex mFrameSyncMutex; static QWaylandWindow *mMouseGrab; + QReadWriteLock mSurfaceLock; + friend class QWaylandSubSurface; }; |