From 80e7ea928f3b69dec90c0020671c5d7354c37227 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Wed, 10 Aug 2011 10:05:03 +0300
Subject: Handle EINTR gracefully in Wayland clipboard.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Idd5082f02eb6708685421492afb8ad5b8546a5d6
Reviewed-on: http://codereview.qt.nokia.com/2810
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---
 src/plugins/platforms/wayland/qwaylandclipboard.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
index d20f183efe..45f0abc00a 100644
--- a/src/plugins/platforms/wayland/qwaylandclipboard.cpp
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
@@ -50,6 +50,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QtDebug>
 #include <QtGui/private/qdnd_p.h>
+#include <QtCore/private/qcore_unix_p.h> // for QT_READ
 
 static QWaylandClipboard *clipboard = 0;
 
@@ -219,7 +220,7 @@ QVariant QWaylandClipboard::retrieveData(const QString &mimeType, QVariant::Type
     char buf[256];
     int n;
     close(pipefd[1]);
-    while ((n = read(pipefd[0], &buf, sizeof buf)) > 0)
+    while ((n = QT_READ(pipefd[0], &buf, sizeof buf)) > 0)
         content.append(buf, n);
     close(pipefd[0]);
     return content;
-- 
cgit v1.2.3