summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-06-12 09:47:02 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-06-12 12:16:35 +0000
commit2c956efefd5cddf7eca606e15aee70c2dcd192eb (patch)
tree97b702063e2c76d55016cf4356175f42178d3649 /src/core
parentfdd26164ba4aaf9a94cec74e5e9bd5f5a8efe3ae (diff)
Add some info when project is misconfigured
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 <michael.bruning@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core.pro8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/core.pro b/src/core/core.pro
index 3b7aea4f0..f2d3fd307 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -26,8 +26,12 @@ core_api.depends = gn_run
core_project.file = core_project.pro
core_project.depends = gn_run
-!qtConfig(webengine-core-support):qtConfig(build-qtwebengine-core):!qtwebengine_makeCheckWebEngineCoreError():!build_pass {
- errorbuild.commands = @echo $$shell_quote(QtWebEngineCore module will not be built. $${skipBuildReason})
+!qtConfig(webengine-core-support):qtConfig(build-qtwebengine-core):!build_pass {
+ !qtwebengine_makeCheckWebEngineCoreError() {
+ errorbuild.commands = @echo $$shell_quote("QtWebEngineCore module will not be built. $${skipBuildReason}")
+ } else {
+ errorbuild.commands = @echo $$shell_quote("QtWebEngineCore 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