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/core/api/core_api.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/core/api/core_api.pro') diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index 727d82b8a..bda6bf51c 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -4,8 +4,7 @@ DESTDIR = $$OUT_PWD/$$getConfigDir() TEMPLATE = lib CONFIG += staticlib c++14 -QT += network core-private -QT_PRIVATE += webenginecoreheaders-private +QT += network core-private webenginecoreheaders-private # Don't create .prl file for this intermediate library because # their contents get used when linking against them, breaking -- cgit v1.2.3