diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-05 15:21:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-05 17:17:07 +0100 |
| commit | 313266901ed522499daff814750a70f774eb5ac5 (patch) | |
| tree | 8032e502f7720c657a5fc7788eeefd997084b20f /tools/configure/environment.cpp | |
| parent | 9c2ec72b95c13991f3c62b762783373c3d691337 (diff) | |
configure: Use forward slashes in findFile-functions consistently.
Convert to native where required.
Change-Id: I11ff99ff9921bc470ebd804944e3b0773d49387c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure/environment.cpp')
| -rw-r--r-- | tools/configure/environment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 9d0194bcbf..2d44bdbbf6 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -517,7 +517,6 @@ static QStringList splitPathList(const QString &path) QRegExp splitReg(QStringLiteral("[:]")); #endif QStringList result = path.split(splitReg, QString::SkipEmptyParts); - const QChar separator = QDir::separator(); const QStringList::iterator end = result.end(); for (QStringList::iterator it = result.begin(); it != end; ++it) { // Remove any leading or trailing ", this is commonly used in the environment @@ -526,7 +525,8 @@ static QStringList splitPathList(const QString &path) it->remove(0, 1); if (it->endsWith('"')) it->chop(1); - if (it->endsWith(separator)) + *it = QDir::cleanPath(*it); + if (it->endsWith(QLatin1Char('/'))) it->chop(1); } return result; |