AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.exe: Fix line feed character

Browse Source 
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 <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Debao Zhang 2012-12-24 12:48:45 +08:00 committed by The Qt Project
parent c9ae652487
commit eaeccce3cc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/configure/configureapp.cpp
View File

@ -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" ];
@ -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"))