diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-05-01 07:38:12 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-06-12 08:39:19 +0000 |
| commit | 2715088397641a85c1fb61d64bdb4c677713337f (patch) | |
| tree | 030309fb1dbf51553273f0b1948087088e6d4935 /src/core/web_contents_view_qt.h | |
| parent | b7f36051fb0bd16fa61e08ecd77978a45a125dea (diff) | |
Fine tune configure and clean up header includes
Previously configure was generating two config headers
qtwebengine-config.h and qtwebengine-config_p.h, however
those headers were never installed or included as dependency
in Makefiles. Moreover, due to the name clash all features
were included into qt_lib_webengine_*.pri which is
QtWebEngine QML module.
Move configure to core so all features belong now to
qt_lib_webenginecore*.pri. Fix global includes to include
qtwebenginecore-config*.h.
Drop all DEFINES and use QT_CONFIG instead.
Cleanup all evil looking includes in headers for webengine and
webenginewidgets.
Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/web_contents_view_qt.h')
| -rw-r--r-- | src/core/web_contents_view_qt.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h index 1e4b27535..17058e05c 100644 --- a/src/core/web_contents_view_qt.h +++ b/src/core/web_contents_view_qt.h @@ -45,8 +45,6 @@ #include "content/browser/web_contents/web_contents_view.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" - -#include "qtwebenginecoreglobal_p.h" #include "render_widget_host_view_qt.h" #include "web_contents_adapter_client.h" #include "web_contents_delegate_qt.h" |