diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 3a352f459c..7cc05de6a3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1955,8 +1955,8 @@ bool Configure::checkAvailability(const QString &part) else if (part == "DBUS") available = findFile("dbus\\dbus.h"); else if (part == "CETEST") { - QString rapiHeader = locateFile("rapi.h"); - QString rapiLib = locateFile("rapi.lib"); + const QString rapiHeader = QDir::toNativeSeparators(locateFile("rapi.h")); + const QString rapiLib = QDir::toNativeSeparators(locateFile("rapi.lib")); available = (dictionary.value("XQMAKESPEC").startsWith("wince")) && !rapiHeader.isEmpty() && !rapiLib.isEmpty(); if (available) { dictionary[ "QT_CE_RAPI_INC" ] += QLatin1String("\"") + rapiHeader + QLatin1String("\""); 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; |