From 2c956efefd5cddf7eca606e15aee70c2dcd192eb Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 12 Jun 2020 09:47:02 +0200 Subject: Add some info when project is misconfigured MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We support calling make on not configured properly qtwebengine and qtpdf. This avoids issues when there is no make file for top level build and user does not understand why. To do that we 'share' error messages between configure and make calls. However to avoid duplicating tests and error messages 'configure test conditions' have to match 'error messages' in support.pri. In case we miss some error message just ask for reporting the bug, instead of still trying to build the thing. Change-Id: I23320afa5174b5f33871c8cd8739ceea8e3a169d Reviewed-by: Michael Brüning --- src/pdf/pdf.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/pdf') diff --git a/src/pdf/pdf.pro b/src/pdf/pdf.pro index e8cc031d5..fcdfafab5 100644 --- a/src/pdf/pdf.pro +++ b/src/pdf/pdf.pro @@ -9,8 +9,12 @@ gn_run.depends = pdfcore_generator pdfcore.depends = gn_run quick.depends = pdfcore -!qtConfig(webengine-qtpdf-support):qtConfig(build-qtpdf):!qtwebengine_makeCheckPdfError():!isEmpty(skipBuildReason):!build_pass { - errorbuild.commands = @echo $$shell_quote(QtPdf will not be built. $${skipBuildReason}) +!qtConfig(webengine-qtpdf-support):qtConfig(build-qtpdf)::!build_pass { + !qtwebengine_makeCheckPdfError() { + errorbuild.commands = @echo $$shell_quote("QtPdf will not be built. $${skipBuildReason}") + } else { + errorbuild.commands = @echo $$shell_quote("QtPdf module will not be built for unknown reason, please open a bug report at https://bugreports.qt.io") + } errorbuild.CONFIG = phony QMAKE_EXTRA_TARGETS += errorbuild first.depends += errorbuild -- cgit v1.2.3