diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:34:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:44:57 +0200 |
commit | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (patch) | |
tree | af152f5ace10bdc5996ac0fb7cc7fd897928d60a /src/core/content_browser_client_qt.cpp | |
parent | 73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e (diff) | |
parent | 9fdc847c639ef7060a13b10d9fe704e40357a0a8 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/webengine/api/qquickwebenginesettings_p.h
src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
Change-Id: I9cac7059557084a575af02782af886f55a8d404f
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index b9e89200d..a422c63a3 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -46,7 +46,7 @@ #if BUILDFLAG(ENABLE_SPELLCHECK) #include "chrome/browser/spellchecker/spellcheck_message_filter.h" #if BUILDFLAG(USE_BROWSER_SPELLCHECKER) -#include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" +#include "components/spellcheck/browser/spellcheck_message_filter_platform.h" #endif #endif #include "content/browser/renderer_host/render_view_host_delegate.h" |