Commit f8bdc6c7 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen Committed by Allan Sandfeld Jensen
Browse files

Use QDir::separator() where paths might be generated for Windows


Change-Id: Id7afc11cd58f671ff5ce629cfc29bdb6d9567dc2
Reviewed-by: default avatarPierre Rossi <pierre.rossi@theqtcompany.com>
Showing with 2 additions and 2 deletions
...@@ -171,7 +171,7 @@ QString localesPath() ...@@ -171,7 +171,7 @@ QString localesPath()
#if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
return getResourcesPath(frameworkBundle()) % QLatin1String("/qtwebengine_locales"); return getResourcesPath(frameworkBundle()) % QLatin1String("/qtwebengine_locales");
#else #else
return location(QLibraryInfo::TranslationsPath) % QLatin1String("/qtwebengine_locales"); return location(QLibraryInfo::TranslationsPath) % QDir::separator() % QLatin1String("qtwebengine_locales");
#endif #endif
} }
...@@ -204,7 +204,7 @@ base::FilePath WebEngineLibraryInfo::getPath(int key) ...@@ -204,7 +204,7 @@ base::FilePath WebEngineLibraryInfo::getPath(int key)
#if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
return toFilePath(getResourcesPath(frameworkBundle()) % QLatin1String("/qtwebengine_resources.pak")); return toFilePath(getResourcesPath(frameworkBundle()) % QLatin1String("/qtwebengine_resources.pak"));
#else #else
return toFilePath(location(QLibraryInfo::DataPath) % QLatin1String("/qtwebengine_resources.pak")); return toFilePath(location(QLibraryInfo::DataPath) % QDir::separator() % QLatin1String("qtwebengine_resources.pak"));
#endif #endif
case base::FILE_EXE: case base::FILE_EXE:
case content::CHILD_PROCESS_EXE: case content::CHILD_PROCESS_EXE:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment