From 2715088397641a85c1fb61d64bdb4c677713337f Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 1 May 2018 07:38:12 +0200 Subject: 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 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/webengine.pro | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/webengine/webengine.pro') diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 570f41866..7b2818a06 100644 --- a/src/webengine/webengine.pro +++ b/src/webengine/webengine.pro @@ -1,5 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) # workaround for QTBUG-68093 +QT_FOR_CONFIG += webenginecore-private TARGET = QtWebEngine @@ -7,7 +7,7 @@ TARGET = QtWebEngine DEFINES += QT_BUILD_WEBENGINE_LIB QT += qml quick webenginecore -QT_PRIVATE += quick-private gui-private core-private +QT_PRIVATE += quick-private gui-private core-private webenginecore-private QMAKE_DOCS = $$PWD/doc/qtwebengine.qdocconf @@ -60,19 +60,8 @@ HEADERS = \ qtConfig(webengine-testsupport) { QT_PRIVATE += testlib - SOURCES += api/qquickwebenginetestsupport.cpp HEADERS += api/qquickwebenginetestsupport_p.h - - DEFINES += ENABLE_QML_TESTSUPPORT_API -} - -qtConfig(webengine-spellchecker) { - DEFINES += ENABLE_SPELLCHECK -} - -qtConfig(webengine-printing-and-pdf) { - DEFINES += ENABLE_PDF } !build_pass { -- cgit v1.2.3