diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-11 12:57:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-11 12:57:42 +0200 |
| commit | 147d70f330648acd105d6eb62493366fcf1e3abd (patch) | |
| tree | b47c0939bc7dfa155b787448da5102a10a156cfe /src/core/web_contents_adapter.h | |
| parent | 7f89badd0e1b71dabb5a88d1330b08ce9d8b6eb7 (diff) | |
| parent | af1c0087e51b6e2ad905259bb7a1d50101735d2d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/3rdparty
src/core/configure.json
src/core/profile_io_data_qt.cpp
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
Change-Id: Ie8ae4aa03881a0733ff497fff46e3f7040735650
Diffstat (limited to 'src/core/web_contents_adapter.h')
| -rw-r--r-- | src/core/web_contents_adapter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index 79aa68456..da4bc9190 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -217,6 +217,7 @@ public: bool canViewSource(); void focusIfNecessary(); bool isFindTextInProgress() const; + bool hasFocusedFrame() const; // meant to be used within WebEngineCore only void initialize(content::SiteInstance *site); |