From eaeccce3cc3869ede1cb9408b350088630a7ecbb Mon Sep 17 00:00:00 2001
From: Debao Zhang <hello@debao.me>
Date: Mon, 24 Dec 2012 12:48:45 +0800
Subject: [PATCH] configure.exe: Fix line feed character
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>
---
tools/configure/configureapp.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5b8039c109b..7a80852b7ac 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -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"))
--
GitLab