Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't omit empty lines in log output #1508

Merged
merged 2 commits into from
Aug 15, 2023
Merged

Don't omit empty lines in log output #1508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a351d18
Allow empty lines in log output
comp500 Aug 9, 2023
1c3449e
Remove unnecessary #if
comp500 Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 3 additions & 8 deletions launcher/LoggedProcess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down