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

Client: Remove failing assert on compositors without wl_data_device

Browse Source 
Some compositors don't advertise wl_data_device_manager support, and the client
has no control over this, so the assertion doesn't make sense. Returning
nullptr in that case should be fine.

Change-Id: If0b145326d074ea4ebf8f5a12654962d56012a2d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-10-02 13:54:59 +02:00 committed by Johan Helsing
parent 5efef3d981
commit f086d96035
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -297,7 +297,6 @@ void QWaylandInputDevice::setDataDevice(QWaylandDataDevice *device)
QWaylandDataDevice *QWaylandInputDevice::dataDevice() const QWaylandDataDevice *QWaylandInputDevice::dataDevice() const
{ {
Q_ASSERT(mDataDevice);
return mDataDevice; return mDataDevice;
} }
#endif #endif