diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-08-17 14:23:37 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-08-17 14:23:37 +0300 |
| commit | 4a1d85f99913d0bacf8cdd118c81401378c758b6 (patch) | |
| tree | e8389ba64e1b1a303545f1dad242c9a9124ddca9 /launcher/LoggedProcess.cpp | |
| parent | 939a2d67ed75be714e9f3b1b918250d006b3860a (diff) | |
| parent | 85f36ebed7e1295547cd2324d1baf7834be89c31 (diff) | |
| download | PrismLauncher-4a1d85f99913d0bacf8cdd118c81401378c758b6.tar.gz PrismLauncher-4a1d85f99913d0bacf8cdd118c81401378c758b6.tar.bz2 PrismLauncher-4a1d85f99913d0bacf8cdd118c81401378c758b6.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
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; } |