diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-13 13:49:08 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-14 09:16:38 +0000 |
| commit | e138b30689e49229cbeb0cba8ecd4116e3ee91d5 (patch) | |
| tree | 9fc4bcf3115fc99ca7f8c8240822aa56b5adf6ca /src/core/web_engine_library_info.cpp | |
| parent | ae15f74a1644f6b02c51e8b4a169671c1d0c9af9 (diff) | |
Remove eAndroid hooks
Support for the B2Qt/eAndroid platform is discontinued with
Qt 5.5 so we can remove all remnants of the android platform.
Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index 835fe8bba..573e16319 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -223,20 +223,6 @@ QString localesPath() } // namespace -#if defined(OS_ANDROID) -namespace base { -// Replace the Android base path provider that depends on jni. -// With this we avoid patching chromium which we would need since -// PathService registers PathProviderAndroid by default on Android. -bool PathProviderAndroid(int key, FilePath* result) -{ - *result = WebEngineLibraryInfo::getPath(key); - return !(result->empty()); -} - -} -#endif // defined(OS_ANDROID) - base::FilePath WebEngineLibraryInfo::getPath(int key) { QString directory; @@ -267,13 +253,6 @@ base::FilePath WebEngineLibraryInfo::getPath(int key) #else return toFilePath(location(QLibraryInfo::DataPath)); #endif -#if defined(OS_ANDROID) - case base::DIR_SOURCE_ROOT: - case base::DIR_ANDROID_EXTERNAL_STORAGE: - case base::DIR_ANDROID_APP_DATA: - directory = QStandardPaths::writableLocation(QStandardPaths::DataLocation); - break; -#endif case content::DIR_MEDIA_LIBS: return toFilePath(pluginsPath()); case ui::DIR_LOCALES: |