diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:25 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:26 +0200 |
commit | e027c7241f073f5fc8c1db88700cc83635b6454f (patch) | |
tree | 69920e408b5eeb1547c0241696cfa845af85e4be /src/plugins/platforms/xcb/qxcbbackingstore.h | |
parent | b2035d38e8dfdfe2ba8da96df5c1174f01dfbb5b (diff) | |
parent | 3b85d53913741660473dbc242a48c2ee65d51421 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0120f804522c0c652e9537b6e9fe08189f071ed2
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbbackingstore.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbbackingstore.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h index 2e8fbfb7fa..747626c213 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.h +++ b/src/plugins/platforms/xcb/qxcbbackingstore.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -class QXcbShmImage; +class QXcbBackingStoreImage; class QXcbBackingStore : public QXcbObject, public QPlatformBackingStore { @@ -75,7 +75,7 @@ public: void endPaint() override; private: - QXcbShmImage *m_image; + QXcbBackingStoreImage *m_image = nullptr; QStack<QRegion> m_paintRegions; QImage m_rgbImage; }; |