diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-23 09:55:56 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-23 10:34:58 +0200 |
| commit | 717b4ddc6044d6ade9186148edd47c77b4120af5 (patch) | |
| tree | ea3c8b66fd6f6b6e040d5d1de6a14bb6a230eb53 /src/client/qwaylandintegration_p.h | |
| parent | 5d43a686fc3d5f13087a61e8ef216ecbbae0d15e (diff) | |
| parent | 13ca5859d3e4a3e22532978dc1bd8629d9aa2107 (diff) | |
Merge "Merge remote-tracking branch 'qt/5.12' into 5.12.5"
Diffstat (limited to 'src/client/qwaylandintegration_p.h')
| -rw-r--r-- | src/client/qwaylandintegration_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index a5a3d7b69..7c1cb978a 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -54,6 +54,7 @@ #include <QtWaylandClient/qtwaylandclientglobal.h> #include <qpa/qplatformintegration.h> #include <QtCore/QScopedPointer> +#include <QtCore/QMutex> QT_BEGIN_NAMESPACE @@ -148,6 +149,7 @@ private: QScopedPointer<QPlatformAccessibility> mAccessibility; #endif bool mFailed = false; + QMutex mClientBufferInitLock; bool mClientBufferIntegrationInitialized = false; bool mServerBufferIntegrationInitialized = false; bool mShellIntegrationInitialized = false; |