summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:07:32 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:10:29 +0100
commit02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch)
tree156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /tools/configure/configureapp.cpp
parentbf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff)
parent0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r--tools/configure/configureapp.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5b8039c109..7a80852b7a 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"))