diff options
| author | Arvid Nilsson <anilsson@blackberry.com> | 2013-12-05 16:53:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 15:19:13 +0100 |
| commit | ae600d6b0fdb4bf9b5589df7bac162b1b112c7dd (patch) | |
| tree | 92192da0088576e04710ccdf7d2a40a033c06129 /src/core/resource_bundle_qt.cpp | |
| parent | 3a20190095be8952a64e0510a0724cfbcd75092b (diff) | |
Introduce WebEngineLibraryInfo for providing paths
This allows us to customize paths on BlackBerry, where QtWebEngine is
currently installed to an different location than the rest of Qt5.
Change-Id: I7144c992bed9fe4d7543ce0d23ee8cd5f5669dd9
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/resource_bundle_qt.cpp')
| -rw-r--r-- | src/core/resource_bundle_qt.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp index ea893d330..05c168101 100644 --- a/src/core/resource_bundle_qt.cpp +++ b/src/core/resource_bundle_qt.cpp @@ -42,11 +42,7 @@ #include "base/command_line.h" #include "content/public/common/content_switches.h" #include "ui/base/resource/resource_bundle.h" -#include "type_conversion.h" - -#include <QFileInfo> -#include <QLibraryInfo> -#include <QStringBuilder> +#include "web_engine_library_info.h" namespace ui { @@ -57,7 +53,7 @@ void ResourceBundle::LoadCommonResources() return; // We repacked the resources we need and installed them. now let chromium mmap that file. - AddDataPackFromPath(base::FilePath(toFilePathString(QLibraryInfo::location(QLibraryInfo::DataPath) % QStringLiteral("/qtwebengine_resources.pak"))) , SCALE_FACTOR_100P); + AddDataPackFromPath(WebEngineLibraryInfo::repackedResourcesPath(), SCALE_FACTOR_100P); } // As GetLocaleFilePath is excluded for Mac in resource_bundle.cc, |