summaryrefslogtreecommitdiff
path: root/platform/default/asset_file_source.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-01-11 15:00:56 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-01-13 13:40:31 -0800
commit5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392 (patch)
treed37991995bd21955379e690b677fc288109aa2c1 /platform/default/asset_file_source.cpp
parent86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1 (diff)
downloadqtlocation-mapboxgl-5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392.tar.gz
[core] Eliminate platform::assetRoot()
I regenerated assets.zip so that all file paths have an `assets/` prefix, as the Android AssetFileSource implementation asserts, and removed `TEST_DATA` from the paths.
Diffstat (limited to 'platform/default/asset_file_source.cpp')
-rw-r--r--platform/default/asset_file_source.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/default/asset_file_source.cpp b/platform/default/asset_file_source.cpp
index 5aa5730c94..2573966c72 100644
--- a/platform/default/asset_file_source.cpp
+++ b/platform/default/asset_file_source.cpp
@@ -67,7 +67,7 @@ private:
AssetFileSource::AssetFileSource(const std::string& root)
: thread(std::make_unique<util::Thread<Impl>>(
util::ThreadContext{"AssetFileSource", util::ThreadType::Worker, util::ThreadPriority::Regular},
- root.empty() ? platform::assetRoot() : root)) {
+ root)) {
}
AssetFileSource::~AssetFileSource() = default;