diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:20:02 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:20:29 +0100 |
| commit | f4bfdc5eed9f153f02f8370dc8bfa4aaea6de38c (patch) | |
| tree | bd55c08da1d4c32ff16952b8ea5e3d96c19c5594 /src/client/qwaylandshmbackingstore_p.h | |
| parent | 97091ce346cebac7f03a1a98c58d44d8d22edc2e (diff) | |
| parent | 19f688dac38ba439dc5068fc6ad02dc271422702 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/compositor/compositor_api/qwaylandsurface.cpp
Change-Id: I3ee40153c959dbe31ea685571c5a8bb1ae36606e
Diffstat (limited to 'src/client/qwaylandshmbackingstore_p.h')
| -rw-r--r-- | src/client/qwaylandshmbackingstore_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h index b1e326c37..397d6bdbf 100644 --- a/src/client/qwaylandshmbackingstore_p.h +++ b/src/client/qwaylandshmbackingstore_p.h @@ -47,6 +47,7 @@ #include <qpa/qplatformbackingstore.h> #include <QtGui/QImage> #include <qpa/qplatformwindow.h> +#include <QMutex> QT_BEGIN_NAMESPACE @@ -107,6 +108,7 @@ private: QWaylandShmBuffer *mBackBuffer; bool mFrontBufferIsDirty; bool mPainting; + QMutex mMutex; QSize mRequestedSize; Qt::WindowFlags mCurrentWindowFlags; |