summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-10-02 13:54:59 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-10-03 06:32:49 +0000
commitcfdb5926d3c98bf0d759acdf2a4f1fd738f39b9c (patch)
tree1d25f23f47616c204c3669fe2681a02e32cce35d
parenta1ca3ae56f33bff34db71d1dec6104d0d6614e6d (diff)
Client: Remove failing assert on compositors without wl_data_device
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>
-rw-r--r--src/client/qwaylandinputdevice.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index b4b7c4ef..37c6fbe9 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -297,7 +297,6 @@ void QWaylandInputDevice::setDataDevice(QWaylandDataDevice *device)
QWaylandDataDevice *QWaylandInputDevice::dataDevice() const
{
- Q_ASSERT(mDataDevice);
return mDataDevice;
}
#endif