diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 13:21:32 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 13:31:01 +0300 |
| commit | 3cd4e0aa7961889eb06374885ed648f5b9bd85bc (patch) | |
| tree | 6a089aedea155b1f1a74b553f4d1b57c70554a8f /src/core/common | |
| parent | 6d029165d1593c514db08c34d6b08a00a4435d5e (diff) | |
| parent | 38063a6332b9f948a0381763271e9a9ac7af0999 (diff) | |
Merge tag 'v6.2.9-lts' into tqtc/lts-6.2-opensource6.2.9
Qt 6.2.9-lts release
Conflicts solved:
dependencies.yaml
examples/webenginewidgets/push-notifications/CMakeLists.txt
Change-Id: I0127c2575369f6939df89f3301659470d481b9bf
Diffstat (limited to 'src/core/common')
| -rw-r--r-- | src/core/common/extensions/extensions_client_qt.cpp | 6 | ||||
| -rw-r--r-- | src/core/common/extensions/extensions_client_qt.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/core/common/extensions/extensions_client_qt.cpp b/src/core/common/extensions/extensions_client_qt.cpp index 30d1836ca..9240e6528 100644 --- a/src/core/common/extensions/extensions_client_qt.cpp +++ b/src/core/common/extensions/extensions_client_qt.cpp @@ -122,6 +122,12 @@ bool ExtensionsClientQt::IsBlocklistUpdateURL(const GURL &url) const return true; } +const GURL &ExtensionsClientQt::GetNewWebstoreBaseURL() const +{ + static GURL dummy; + return dummy; +} + // Returns the set of file paths corresponding to any images within an // extension's contents that may be displayed directly within the browser UI // or WebUI, such as icons or theme images. This set of paths is used by the diff --git a/src/core/common/extensions/extensions_client_qt.h b/src/core/common/extensions/extensions_client_qt.h index b0069db22..b2d128bf9 100644 --- a/src/core/common/extensions/extensions_client_qt.h +++ b/src/core/common/extensions/extensions_client_qt.h @@ -74,6 +74,8 @@ public: // extension blacklist URL. bool IsBlocklistUpdateURL(const GURL &url) const override; + const GURL &GetNewWebstoreBaseURL() const override; + // Returns the set of file paths corresponding to any images within an // extension's contents that may be displayed directly within the browser UI // or WebUI, such as icons or theme images. This set of paths is used by the |