diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
| commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
| tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /tools | |
| parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
| parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 16 |
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")) |