3 files changed, 26 insertions, 1 deletions
diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp
index c3ac51df949..5415ad7830e 100644
--- a/src/corelib/io/qwindowspipereader.cpp
+++ b/src/corelib/io/qwindowspipereader.cpp
@@ -233,6 +233,25 @@ qint64 QWindowsPipeReader::readLine(char *data, qint64 maxlen)
 }
 
 /*!
+    Skips up to \c{maxlen} bytes from the internal read buffer.
+ */
+qint64 QWindowsPipeReader::skip(qint64 maxlen)
+{
+    QMutexLocker locker(&mutex);
+
+    const qint64 skippedSoFar = readBuffer.skip(qMin(actualReadBufferSize, maxlen));
+    actualReadBufferSize -= skippedSoFar;
+
+    if (!pipeBroken) {
+        startAsyncReadHelper(&locker);
+        if (skippedSoFar == 0)
+            return -2;      // signal EWOULDBLOCK
+    }
+
+    return skippedSoFar;
+}
+
+/*!
     Returns \c true if a complete line of data can be read from the buffer.
  */
 bool QWindowsPipeReader::canReadLine() const
diff --git a/src/corelib/io/qwindowspipereader_p.h b/src/corelib/io/qwindowspipereader_p.h
index e2190d67d92..5eb62cb393d 100644
--- a/src/corelib/io/qwindowspipereader_p.h
+++ b/src/corelib/io/qwindowspipereader_p.h
@@ -79,6 +79,7 @@ public:
     qint64 bytesAvailable() const;
     qint64 read(char *data, qint64 maxlen);
     qint64 readLine(char *data, qint64 maxlen);
+    qint64 skip(qint64 maxlen);
     bool canReadLine() const;
     DWORD checkPipeState();
     bool checkForReadyRead() { return consumePendingAndEmit(false); }
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index 89901533af1..e430f642db9 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -277,7 +277,12 @@ qint64 QLocalSocket::readLineData(char *data, qint64 maxSize)
 
 qint64 QLocalSocket::skipData(qint64 maxSize)
 {
-    return QIODevice::skipData(maxSize);
+    Q_D(QLocalSocket);
+
+    if (!maxSize)
+        return 0;
+
+    return transformPipeReaderResult(d->pipeReader->skip(maxSize));
 }
 
 qint64 QLocalSocket::writeData(const char *data, qint64 len)