diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-07-19 14:57:59 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-07-19 15:45:40 +0200 |
commit | a95c6266282e17aa17642c6a03e234b067eb5599 (patch) | |
tree | af570d1f499f841ebe38bb7881d3d4e8c6dffa54 /lib | |
parent | fbc1b75ffa8d2163d92f3c59a56a22bf18977a7a (diff) |
Fix the duplicate symbols build failure.
resource_bundle_*.cc weren't excluded properly and
ResourceBundle::GetLocaleFilePath is in resource_bundle.cc
rather than resource_bundle_gtk.cc.
Change-Id: I9e56a7d88e859354a4d7115a61b99f7487fc7a39
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/resource_bundle_qt.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/resource_bundle_qt.cpp b/lib/resource_bundle_qt.cpp index 4df349eda..d776946ee 100644 --- a/lib/resource_bundle_qt.cpp +++ b/lib/resource_bundle_qt.cpp @@ -144,11 +144,6 @@ void ResourceBundle::LoadCommonResources() AddDataPack(data_pack.release()); } -base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& /*app_locale*/, bool /*test_file_exists*/) -{ - return base::FilePath(); -} - gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { LOG(WARNING) << "Unable to load image with id " << resource_id; |