summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorViktor Engelmann <viktor.engelmann@qt.io>2017-07-04 11:57:09 +0200
committerViktor Engelmann <viktor.engelmann@qt.io>2017-07-05 09:24:52 +0000
commitce1964ddcff9a213ad33fc8ba3a35b6d4322fadf (patch)
treeb582b358d864adf8ecf9d47ff00bc0c26c6772e3 /mkspecs
parentda2e7b1331cb27142058a9f1d1debd363c5dd151 (diff)
Add Configure-Time Tests for gperf, flex and bison
Configure-Time tests for presence of (required) gperf, bison and flex are added to configure.pri and configure.json, so that we can decide early on to skip the build, instead of starting a build that will fail much later, yield incomprehensible error messages and make the build of the complete Qt framework fail. Task-number: QTBUG-52805 Change-Id: I7dab49e6e8672b72901519ad7d88de97197fe587 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/configure.prf13
1 files changed, 13 insertions, 0 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index c1e919603..a07171b3e 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -24,6 +24,19 @@ defineTest(runConfigure) {
include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
QT_FOR_CONFIG += webengine-private
+ !qtConfig(gperf) {
+ skipBuild("Required gperf could not be found.")
+ return(false)
+ }
+ !qtConfig(bison) {
+ skipBuild("Required bison could not be found.")
+ return(false)
+ }
+ !qtConfig(flex) {
+ skipBuild("Required flex could not be found.")
+ return(false)
+ }
+
qtConfig(pepper-plugins): WEBENGINE_CONFIG += use_pepper_plugins
qtConfig(printing-and-pdf): WEBENGINE_CONFIG += use_printing use_pdf
qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs