diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2019-02-05 14:50:22 +0100 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2019-02-05 16:56:24 +0100 |
commit | 7aa06a1614b7ca6508d96ee2e8ef0f4c49038a6f (patch) | |
tree | 4331533a6c0fa7a843c831d66e62472a7f8a4d30 /src/core/profile_io_data_qt.cpp | |
parent | 5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 (diff) | |
parent | f17f815878d1d3f02f464347d2807555cab00a88 (diff) |
Merge remote-tracking branch 'origin/dev' into 5.13
Conflicts:
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547
Diffstat (limited to 'src/core/profile_io_data_qt.cpp')
-rw-r--r-- | src/core/profile_io_data_qt.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index dc5b6624e..4815b8749 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -223,6 +223,13 @@ content::ResourceContext *ProfileIODataQt::resourceContext() return m_resourceContext.get(); } +#if BUILDFLAG(ENABLE_EXTENSIONS) +extensions::ExtensionSystemQt* ProfileIODataQt::GetExtensionSystem() +{ + return m_profile->GetExtensionSystem(); +} +#endif // BUILDFLAG(ENABLE_EXTENSIONS) + void ProfileIODataQt::initializeOnIOThread() { m_networkDelegate.reset(new NetworkDelegateQt(this)); |