Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Prevent crash in wayland mimedata in case there is no offer.
This commit is contained in:
commit
2de195b450
@ -199,6 +199,8 @@ void QWaylandClipboard::forceRoundtrip(struct wl_display *display)
|
||||
QVariant QWaylandClipboard::retrieveData(const QString &mimeType, QVariant::Type type) const
|
||||
{
|
||||
Q_UNUSED(type);
|
||||
if (mOfferedMimeTypes.isEmpty() || !mOffer)
|
||||
return QVariant();
|
||||
int pipefd[2];
|
||||
if (pipe(pipefd) == -1) {
|
||||
qWarning("QWaylandClipboard: pipe() failed");
|
||||
|
Loading…
Reference in New Issue
Block a user