diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-12-15 12:21:17 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-01-07 13:40:18 +0100 |
commit | daaa7a9c208671b7b450cf292569fa2f486850fe (patch) | |
tree | 4fab68c549f94655496d3e9ac3b740e7f5285784 /src/core/type_conversion.h | |
parent | 54e05945b0ec4328b9d56b3b6a9886fc24ad3e6a (diff) |
Do not use QDir::separator()
Build all paths Qt-style using / separators, and only convert it when
converted to Chromium types.
Change-Id: I181be6edb903f38e1772bcd324972d1d4e6672fc
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
Diffstat (limited to 'src/core/type_conversion.h')
-rw-r--r-- | src/core/type_conversion.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index f88e5dd21..781023b7c 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -39,6 +39,7 @@ #include <QColor> #include <QDateTime> +#include <QDir> #include <QMatrix4x4> #include <QRect> #include <QString> @@ -142,7 +143,7 @@ inline base::Time toTime(const QDateTime &dateTime) { inline base::FilePath::StringType toFilePathString(const QString &str) { #if defined(OS_WIN) - return str.toStdWString(); + return QDir::toNativeSeparators(str).toStdWString(); #else return str.toStdString(); #endif |