summaryrefslogtreecommitdiff
path: root/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-01-31 22:11:11 +0200
committerOrgad Shaneh <orgads@gmail.com>2015-02-02 08:32:59 +0000
commit1bcfa137a3e625eaafba2e1b5622c87946da7ccc (patch)
treee7a5d059a32ce7f55c5804446931f4675d45770f /src/plugins/resourceeditor/qrceditor/resourcefile.cpp
parent704f3d539bc310cdd58aaa19613b297288774af8 (diff)
downloadqt-creator-1bcfa137a3e625eaafba2e1b5622c87946da7ccc.tar.gz
Do not use QDir::separator() for internal paths
Internal paths are supposed to be normalized Change-Id: Ic6943ce13ad389dfdb44054a9e6f03da8c6cd88d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/resourceeditor/qrceditor/resourcefile.cpp')
-rw-r--r--src/plugins/resourceeditor/qrceditor/resourcefile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index 3df53d09a3..3ba96a466c 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -204,7 +204,7 @@ QString ResourceFile::contents() const
const File &file = *f;
QDomElement felt = doc.createElement(QLatin1String("file"));
relt.appendChild(felt);
- const QString conv_file = relativePath(file.name).replace(QDir::separator(), QLatin1Char('/'));
+ const QString conv_file = QDir::fromNativeSeparators(relativePath(file.name));
const QDomText text = doc.createTextNode(conv_file);
felt.appendChild(text);
if (!file.alias.isEmpty())
@@ -428,7 +428,7 @@ QString ResourceFile::absolutePath(const QString &rel_path) const
return rel_path;
QString rc = QFileInfo(m_file_name).path();
- rc += QDir::separator();
+ rc += QLatin1Char('/');
rc += rel_path;
return QDir::cleanPath(rc);
}