From 160b51018e1e365130173838f9c91a9cb4061ad7 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 29 Apr 2010 16:37:30 +0300 Subject: Fix path removal from target in Symbian builds Qt generic slash separator must be supported also in platforms that do not have that as platform specific separator. Reviewed-by: Thomas Zander --- qmake/generators/symbian/symbiancommon.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp index 0802c01..b730d9e 100644 --- a/qmake/generators/symbian/symbiancommon.cpp +++ b/qmake/generators/symbian/symbiancommon.cpp @@ -464,9 +464,12 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB QString SymbianCommonGenerator::removePathSeparators(QString &file) { QString ret = file; - while (ret.indexOf(QDir::separator()) > 0) { - ret.remove(0, ret.indexOf(QDir::separator()) + 1); - } + + if (QDir::separator().unicode() != '/') + ret.replace(QDir::separator(), QLatin1Char('/')); + + if (ret.indexOf(QLatin1Char('/')) > 0) + ret.remove(0, ret.lastIndexOf(QLatin1Char('/')) + 1); return ret; } -- cgit v0.12