1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on exit

Browse Source 
Make sure that QWaylandDrag and QWaylandClientBufferIntegration are
destructed before the QWaylandDisplay.

Change-Id: I606154c9861a51d7cf3e5afb16d4f805ab9368b8
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Paul Olav Tvete 2016-11-22 15:45:28 +01:00
parent f6912982eb
commit e56040ec7d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/qwaylandintegration_p.h
View File

@ -112,6 +112,11 @@ public:
virtual QWaylandServerBufferIntegration *serverBufferIntegration() const; virtual QWaylandServerBufferIntegration *serverBufferIntegration() const;
virtual QWaylandShellIntegration *shellIntegration() const; virtual QWaylandShellIntegration *shellIntegration() const;
private:
// NOTE: mDisplay *must* be destructed after mDrag and mClientBufferIntegration.
// Do not move this definition into the private section at the bottom.
QScopedPointer<QWaylandDisplay> mDisplay;
protected: protected:
QScopedPointer<QWaylandClientBufferIntegration> mClientBufferIntegration; QScopedPointer<QWaylandClientBufferIntegration> mClientBufferIntegration;
QScopedPointer<QWaylandServerBufferIntegration> mServerBufferIntegration; QScopedPointer<QWaylandServerBufferIntegration> mServerBufferIntegration;
@ -130,7 +135,6 @@ private:
QScopedPointer<QPlatformClipboard> mClipboard; QScopedPointer<QPlatformClipboard> mClipboard;
QScopedPointer<QPlatformDrag> mDrag; QScopedPointer<QPlatformDrag> mDrag;
#endif #endif
QScopedPointer<QWaylandDisplay> mDisplay;
QScopedPointer<QPlatformNativeInterface> mNativeInterface; QScopedPointer<QPlatformNativeInterface> mNativeInterface;
QScopedPointer<QPlatformInputContext> mInputContext; QScopedPointer<QPlatformInputContext> mInputContext;
#if QT_CONFIG(accessibility) #if QT_CONFIG(accessibility)