AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Use forward slashes in findFile-functions consistently.

Browse Source 
Convert to native where required.

Change-Id: I11ff99ff9921bc470ebd804944e3b0773d49387c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Friedemann Kleint 2012-11-05 15:21:52 +01:00 committed by The Qt Project
parent 9c2ec72b95
commit 313266901e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configure/configureapp.cpp
View File

@ -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("\"");

4
tools/configure/environment.cpp
View File

@ -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;