diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-15 10:53:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 10:53:43 +0200 |
| commit | a360ddbe0b6fbebb80518e92e19669a693129c8e (patch) | |
| tree | b47c953f13e06bab1086e6ce4412aba5a3ee60af /launcher/LoggedProcess.cpp | |
| parent | 7ba1e7d3569fcb04cb49d16247703bf2862172ba (diff) | |
| parent | 1c3449e5a292820d3144b7648b5e67ec25d7d46c (diff) | |
| download | PrismLauncher-a360ddbe0b6fbebb80518e92e19669a693129c8e.tar.gz PrismLauncher-a360ddbe0b6fbebb80518e92e19669a693129c8e.tar.bz2 PrismLauncher-a360ddbe0b6fbebb80518e92e19669a693129c8e.zip | |
Merge pull request #1508 from comp500/fix/allow-empty-lines
Diffstat (limited to 'launcher/LoggedProcess.cpp')
| -rw-r--r-- | launcher/LoggedProcess.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/launcher/LoggedProcess.cpp b/launcher/LoggedProcess.cpp index 6978777e..fadd64e6 100644 --- a/launcher/LoggedProcess.cpp +++ b/launcher/LoggedProcess.cpp @@ -65,14 +65,9 @@ QStringList LoggedProcess::reprocess(const QByteArray& data, QTextDecoder& decod m_leftover_line = ""; } -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, QString::SkipEmptyParts); -#else - auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, Qt::SkipEmptyParts); -#endif - - if (!str.endsWith(QChar::LineFeed)) - m_leftover_line = lines.takeLast(); + auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed); + + m_leftover_line = lines.takeLast(); return lines; } |