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.

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

Fix erroneous newline handling in log4qt #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions log4qt/layout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,11 @@ namespace Log4Qt

QString Layout::endOfLine()
{
// There seams to be no function in Qt for this

#ifdef Q_OS_WIN32
return QLatin1String("\r\n");
#endif // Q_OS_WIN32
//#ifdef Q_OS_MAC
// return QLatin1String("\r");
//#endif // Q_OS_MAC
// Qt's output functions seem to handle
// platform specific variations of newline
// for us. For example, on Windows if we here
// return "\r\n", we'll actually get "\r\r\n"
// in the output.
return QLatin1String("\n");
}

Expand Down