diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2021-06-09 01:00:19 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2021-06-09 06:40:11 +0000 |
| commit | 27f8e2dbce774410c5443a7f425eb53c2a869f54 (patch) | |
| tree | 37fa2df3ac5ed9c01f7c8922961308ea7c5c38df /src | |
| parent | b820a832b289ab813172b16b93561b5b25c8e621 (diff) | |
| download | qt-creator-27f8e2dbce774410c5443a7f425eb53c2a869f54.tar.gz | |
Utils: Fix splitting in ChannelBuffer::takeFirstLine()
Escape the '\r'
Change-Id: I8cee40dc4a65f893f1a11c7cf066777498c37339
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/utils/qtcprocess.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 42e80914f7..d6ffe3ebf8 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -875,7 +875,7 @@ QString ChannelBuffer::linesRead() // Check for first complete line inside the rawData and return it, removing the line from the buffer Utils::optional<QString> ChannelBuffer::takeFirstLine() { - const int firstLineEnd = qMax(rawData.indexOf('\n'), rawData.indexOf('r')); + const int firstLineEnd = qMax(rawData.indexOf('\n'), rawData.indexOf('\r')); if (firstLineEnd == -1) return Utils::nullopt; |