feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build on macOS

Browse Source 
Complains about template argument (QString) and type of value
(const QString) not being the same.
make_optional is usually used with template parameter deduction anyhow,
but in this case we can just return the value.

Change-Id: Icc5c6bb4505d09ab6a864fb7a7c6ec97e34b42b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2021-06-04 15:40:15 +02:00
committed by Christian Stenger
parent c624467a5f
commit 66948d9a63
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/qtcprocess.cpp
View File

@@ -880,7 +880,7 @@ Utils::optional<QString> ChannelBuffer::takeFirstLine()
const QString line = QString::fromUtf8(rawData.left(firstLineEnd)); const QString line = QString::fromUtf8(rawData.left(firstLineEnd));
rawData.remove(0, firstLineEnd + 1); rawData.remove(0, firstLineEnd + 1);
return Utils::make_optional<QString>(line); return line;
} }
void ChannelBuffer::append(const QByteArray &text) void ChannelBuffer::append(const QByteArray &text)