diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-29 13:37:30 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-30 06:37:42 (GMT) |
commit | 160b51018e1e365130173838f9c91a9cb4061ad7 (patch) | |
tree | 69a938816fdd496b1b54fd94c565b0a6ff011fe2 /qmake | |
parent | 0d32f1727e50f8e8c252aa208ae811a757671620 (diff) | |
download | Qt-160b51018e1e365130173838f9c91a9cb4061ad7.zip Qt-160b51018e1e365130173838f9c91a9cb4061ad7.tar.gz Qt-160b51018e1e365130173838f9c91a9cb4061ad7.tar.bz2 |
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
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/symbian/symbiancommon.cpp | 9 |
1 files 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; } |