diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:37 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:37 +0200 |
| commit | 23d67d0de3301dbed5d8c5880b6cf60bfa9eeb2a (patch) | |
| tree | 125ededec54da2c760d6eedb0c710b484e6b8e7a | |
| parent | dfd86e07019488954cddcf2ba314df3cd0c01c0c (diff) | |
| parent | 4eb7f8c31beb0d6e0f05e58514b0ec8ce0da5e7e (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: Idac001b3cfec8671318602652d05396a7c7384bc
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0be104e..cac3ad3 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.8 +MODULE_VERSION = 5.15.9 diff --git a/src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java b/src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java index 0bb36de..5295c35 100644 --- a/src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java +++ b/src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java @@ -215,6 +215,11 @@ public class QtAndroidWebViewController m_hasLocationPermission = hasLocationPermission(m_webView); WebSettings webSettings = m_webView.getSettings(); + // The local storage options are not user changeable in QtWebView and disabled by default on Android. + // In QtWebEngine and on iOS local storage is enabled by default, so we follow that. + webSettings.setDatabaseEnabled(true); + webSettings.setDomStorageEnabled(true); + if (Build.VERSION.SDK_INT > 10) { try { m_webViewOnResume = m_webView.getClass().getMethod("onResume"); |