Skip to content

Commit

Permalink
configure.exe: Fix line feed character
Browse files Browse the repository at this point in the history
config.summary has been opened in text mode, so the line feed character
should be "\n" instead of "\r\n".

Change-Id: Id73b0d698487cdd6f48902f3ae988c6a9fa59407
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
dbzhang800 authored and The Qt Project committed Jan 24, 2013
1 parent c9ae652 commit eaeccce
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions tools/configure/configureapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3317,18 +3317,18 @@ void Configure::displayConfig()

// Give some feedback
sout << "Environment:" << endl;
QString env = QString::fromLocal8Bit(getenv("INCLUDE")).replace(QRegExp("[;,]"), "\r\n ");
QString env = QString::fromLocal8Bit(getenv("INCLUDE")).replace(QRegExp("[;,]"), "\n ");
if (env.isEmpty())
env = "Unset";
sout << " INCLUDE=\r\n " << env << endl;
env = QString::fromLocal8Bit(getenv("LIB")).replace(QRegExp("[;,]"), "\r\n ");
sout << " INCLUDE=\n " << env << endl;
env = QString::fromLocal8Bit(getenv("LIB")).replace(QRegExp("[;,]"), "\n ");
if (env.isEmpty())
env = "Unset";
sout << " LIB=\r\n " << env << endl;
env = QString::fromLocal8Bit(getenv("PATH")).replace(QRegExp("[;,]"), "\r\n ");
sout << " LIB=\n " << env << endl;
env = QString::fromLocal8Bit(getenv("PATH")).replace(QRegExp("[;,]"), "\n ");
if (env.isEmpty())
env = "Unset";
sout << " PATH=\r\n " << env << endl;
sout << " PATH=\n " << env << endl;

if (dictionary[QStringLiteral("EDITION")] != QStringLiteral("OpenSource")) {
QString l1 = licenseInfo[ "LICENSEE" ];
Expand All @@ -3342,9 +3342,9 @@ void Configure::displayConfig()
}

sout << "Configuration:" << endl;
sout << " " << qmakeConfig.join("\r\n ") << endl;
sout << " " << qmakeConfig.join("\n ") << endl;
sout << "Qt Configuration:" << endl;
sout << " " << qtConfig.join("\r\n ") << endl;
sout << " " << qtConfig.join("\n ") << endl;
sout << endl;

if (dictionary.contains("XQMAKESPEC"))
Expand Down

0 comments on commit eaeccce

Please sign in to comment.