diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-08-10 10:05:03 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-12 10:49:52 +0200 |
| commit | bafeda59c7707f67e5bbf13f3a4772e21faeb09a (patch) | |
| tree | 6ad936154fb2fe0d3cea031071759f940d6d8b1e /src | |
| parent | a1049ff899fa621ef41266e5af419bddbf0f8cdb (diff) | |
Handle EINTR gracefully in Wayland clipboard.
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandclipboard.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp index d20f183..45f0abc 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; |