From 7906b030dc632557f6a2e8cbb471ebf38ef2121c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 22 May 2020 18:17:51 +0200 Subject: Split errorChecks for webengine and pdf Separate error checks, so qtpdf can have own dependencies. Change-Id: I9e538b875fe67448497f10dcd45c83782d98da2d Reviewed-by: Allan Sandfeld Jensen --- src/src.pro | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 063c148b5..7e82b8296 100644 --- a/src/src.pro +++ b/src/src.pro @@ -7,12 +7,17 @@ include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pr include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri) include($$QTWEBENGINE_OUT_ROOT/src/pdfwidgets/qtpdfwidgets-config.pri) -QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private webengine-private \ - webenginewidgets-private pdf-private pdfwidgets-private +QT_FOR_CONFIG += \ + buildtools-private \ + webenginecore \ + webenginecore-private \ + webengine-private \ + webenginewidgets-private \ + pdf-private \ + pdfwidgets-private TEMPLATE = subdirs - qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { core.depends = buildtools process.depends = core @@ -43,9 +48,9 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { pdf.depends = buildtools qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support): pdf.depends += core - SUBDIRS += pdf !contains(SUBDIRS, buildtools): SUBDIRS += buildtools !contains(SUBDIRS, plugins): SUBDIRS += plugins + SUBDIRS += pdf plugins.depends += pdf qtConfig(pdf-widgets) { pdfwidgets.depends = pdf @@ -53,12 +58,7 @@ qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { } } -!qtConfig(webengine-core-support):if(qtConfig(build-qtwebengine-core)|qtConfig(build-qtpdf)) { - !qtwebengine_makeCheckError():!isEmpty(skipBuildReason):!build_pass { - errorbuild.commands = @echo Modules will not be built. $${skipBuildReason} - errorbuild.CONFIG = phony - QMAKE_EXTRA_TARGETS += errorbuild - first.depends += errorbuild - QMAKE_EXTRA_TARGETS += first - } -} +# this needs to be last line for qmake -r +!contains(SUBDIRS, core): SUBDIRS += core +!contains(SUBDIRS, pdf): SUBDIRS += pdf + -- cgit v1.2.3 From 89d709c422fdca32e0bb0613d7ef4cfad831f706 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 5 Jun 2020 09:14:17 +0200 Subject: Fix build with --no-build-qtpdf --no-build-qtwebengine-core Add missing checks after 7906b030d, we report configure issues only when build was not explicitly disabled. Fixes: QTBUG-84707 Change-Id: I8da216b7e3202edc1306e2288dd9960a4ec687c0 Reviewed-by: Allan Sandfeld Jensen --- src/src.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 7e82b8296..6f8bc2fe4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -59,6 +59,6 @@ qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { } # this needs to be last line for qmake -r -!contains(SUBDIRS, core): SUBDIRS += core -!contains(SUBDIRS, pdf): SUBDIRS += pdf +qtConfig(build-qtwebengine-core):!contains(SUBDIRS, core): SUBDIRS += core +qtConfig(build-qtpdf):!contains(SUBDIRS, pdf): SUBDIRS += pdf -- cgit v1.2.3