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/webenginewidgets/webenginewidgets.pro | |
| 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/webenginewidgets/webenginewidgets.pro')
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index a891c062e..c96bf15bb 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -1,4 +1,5 @@ -QT_FOR_CONFIG += webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) +QT_FOR_CONFIG += webenginecore-private TARGET = QtWebEngineWidgets @@ -6,7 +7,7 @@ TARGET = QtWebEngineWidgets DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB QT += webenginecore widgets network quick -QT_PRIVATE += quick-private gui-private core-private widgets-private quickwidgets +QT_PRIVATE += quick-private gui-private core-private widgets-private quickwidgets webenginecore-private INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api @@ -44,13 +45,7 @@ HEADERS = \ api/qwebengineview_p.h \ render_widget_host_view_qt_delegate_widget.h -qtConfig(webengine-spellchecker) { - DEFINES += ENABLE_SPELLCHECK -} - qtConfig(webengine-printing-and-pdf) { - DEFINES += ENABLE_PRINTING - DEFINES += ENABLE_PDF QT += printsupport } |