diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 10:39:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 10:39:16 (GMT) |
| commit | d369ae7b831744c796571aa86b5d6570b09e70e4 (patch) | |
| tree | 0ad8abef937ac3009f32b600a8e3b5644d7c637c /qmake | |
| parent | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (diff) | |
| parent | 044708cb7f7fd1f2d7b18d20269422e7f3a1cb83 (diff) | |
| download | Qt-d369ae7b831744c796571aa86b5d6570b09e70e4.zip Qt-d369ae7b831744c796571aa86b5d6570b09e70e4.tar.gz Qt-d369ae7b831744c796571aa86b5d6570b09e70e4.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index dadaff4..6d43147 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); |