From 093cf56fc30f7aab9c7b7b34b6ce7b51e9f9e6d7 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 8 Jan 2020 19:48:15 +0100
Subject: Factor out qtpdf-support out of core-support

Make static builds available for ios.

Task-number: QTBUG-77931
Change-Id: Id122190f51f03f782fd0ee1c897e5b4ff891f703
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/buildtools/config/support.pri | 24 +++++++++++++++++++-----
 src/buildtools/configure.json     | 25 +++++++++++++++++++++----
 src/src.pro                       |  2 +-
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
index 5bdd808d4..86ca2f80e 100644
--- a/src/buildtools/config/support.pri
+++ b/src/buildtools/config/support.pri
@@ -6,11 +6,6 @@ defineTest(qtwebengine_skipBuild) {
 
 defineReplace(qtwebengine_checkError) {
 
-    static {
-       qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.")
-       return(false)
-    }
-
     !qtHaveModule(gui) {
         qtwebengine_skipBuild("QtWebEngine requires QtGui.")
         return(false)
@@ -68,6 +63,7 @@ defineReplace(qtwebengine_checkError) {
 
     linux:!qtwebengine_checkErrorForLinux():return(false)
     win:!qtwebengine_checkErrorForWindows():return(false)
+    macos:!qtwebengine_checkErrorForMacOS():return(false)
 
     sanitizer: !qtConfig(webengine-sanitizer) {
         qtwebengine_skipBuild("Chosen sanitizer configuration is not supported for QtWebEngine. Check config.log for details or use -feature-webengine-sanitizer to force build with the chosen sanitizer configuration.")
@@ -77,8 +73,20 @@ defineReplace(qtwebengine_checkError) {
     return(true)
 }
 
+defineTest(qtwebengine_checkErrorFoMacOS) {
+    static {
+       qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.")
+       return(false)
+    }
+}
+
 defineTest(qtwebengine_checkErrorForLinux) {
 
+    static {
+       qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.")
+       return(false)
+    }
+
     !qtConfig(pkg-config) {
         qtwebengine_skipBuild("A pkg-config support is required to build QtWebEngine.")
         return(false)
@@ -114,6 +122,12 @@ defineTest(qtwebengine_checkErrorForLinux) {
 }
 
 defineTest(qtwebengine_checkErrorForWindows) {
+
+    static {
+       qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.")
+       return(false)
+    }
+
     !qtConfig(webengine-win-compiler64) {
         qtwebengine_skipBuild("64-bit cross-building or native toolchain required to build QtWebEngine could not be found.")
         return(false)
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 0f8ce2deb..18a1f9764 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -389,6 +389,22 @@
                          && (!config.win32 || features.webengine-winversion)",
             "output": [ "privateFeature" ]
         },
+        "webengine-qtpdf-support": {
+            "label": "Support Qt Pdf",
+            "condition": "module.gui
+                         && features.webengine-python2
+                         && features.webengine-gperf
+                         && features.webengine-bison
+                         && features.webengine-flex
+                         && features.webengine-submodule
+                         && features.webengine-nowhitespace
+                         && features.webengine-arch-support
+                         && !features.webengine-no-platform-support
+                         && (!config.static || config.ios)
+                         && (!config.linux || features.pkg-config)
+                         && (!config.win32 || features.webengine-winversion)",
+            "output": [ "privateFeature" ]
+        },
         "build-qtwebengine-core": {
             "label": "Build Qt WebEngine Core",
             "purpose": "Provides WebEngine Core support.",
@@ -682,7 +698,8 @@
     "report": [
         {
             "type": "skipBuildWarning",
-            "condition": "!features.webengine-core-support && (features.build-qtwebengine-core || features.build-qtpdf)",
+            "condition": "(!features.webengine-core-support && features.build-qtwebengine-core) ||
+                          (!features.webengine-qtpdf-support && features.build-qtpdf)",
             "message": "qtwebengine_confCheckError"
         },
         {
@@ -692,7 +709,7 @@
         },
         {
             "type": "note",
-            "condition": "features.webengine-core-support && !features.build-qtpdf",
+            "condition": "features.webengine-qtpdf-support && !features.build-qtpdf",
             "message": "QtPdf build is disabled by user."
         },
         {
@@ -702,7 +719,7 @@
         },
         {
             "type": "warning",
-            "condition": "!features.webengine-core-support && features.build-qtpdf",
+            "condition": "!features.webengine-qtpdf-support && features.build-qtpdf",
             "message": "QtPdf will not be built."
         }
     ],
@@ -719,7 +736,7 @@
                 "webengine-developer-build",
                 {
                     "section": "QtWebEngine required system libraries",
-                    "condition": "config.unix && !config.macos",
+                    "condition": "config.unix && !config.macos && !config.ios",
                     "entries": [
                         "webengine-system-fontconfig",
                         "webengine-system-dbus",
diff --git a/src/src.pro b/src/src.pro
index 4bacba3b9..a9c58390c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -40,7 +40,7 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) {
     }
 }
 
-qtConfig(build-qtpdf):qtConfig(webengine-core-support) {
+qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) {
     pdf.depends = buildtools
     SUBDIRS += buildtools pdf plugins
     qtConfig(pdf-widgets) {
-- 
cgit v1.2.3