summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-12-10 13:12:44 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-12-10 13:12:44 (GMT)
commit58334dcd3bf7c65ff910f4b00f356aa5944f2c82 (patch)
tree6b57cdc8f5e60c2486af14f4d89b7d5ec400d68c /qmake
parent6cf07024bfbf795b8c7ddf807668a2255c7b2985 (diff)
downloadQt-58334dcd3bf7c65ff910f4b00f356aa5944f2c82.zip
Qt-58334dcd3bf7c65ff910f4b00f356aa5944f2c82.tar.gz
Qt-58334dcd3bf7c65ff910f4b00f356aa5944f2c82.tar.bz2
fix path separator matching
use QDir::separator() instead of Option::dir_sep in localOS context.
Diffstat (limited to 'qmake')
-rw-r--r--qmake/project.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index d967a63..bd81b17 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -2173,7 +2173,7 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
const QRegExp regex(r, Qt::CaseSensitive, QRegExp::Wildcard);
for(int d = 0; d < dirs.count(); d++) {
QString dir = dirs[d];
- if(!dir.isEmpty() && !dir.endsWith(Option::dir_sep))
+ if(!dir.isEmpty() && !dir.endsWith(QDir::separator()))
dir += "/";
QDir qdir(dir);
@@ -2389,7 +2389,7 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt
return true;
//regular expression I guess
QString dirstr = qmake_getpwd();
- int slsh = file.lastIndexOf(Option::dir_sep);
+ int slsh = file.lastIndexOf(QDir::separator());
if(slsh != -1) {
dirstr = file.left(slsh+1);
file = file.right(file.length() - slsh - 1);