Do not share pdf features with webengine-core

The pdfium build for qtwebengine should not use
features set for qtpdf.

Change-Id: Ibee97b774dda7e9157cadf28aa4a7a862bcba8ed
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 41 insertions, 42 deletions

diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
index be09751c9..9cd8cb089 100644
--- a/src/buildtools/config/common.pri
+++ b/src/buildtools/config/common.pri
@@ -1,8 +1,7 @@
 # Shared configuration for all our supported platforms
 include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri)
 include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri)
-include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri)
-QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private pdf-private
+QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private
 
 gn_args += \
     use_qt=true \
@@ -145,36 +144,3 @@ ccache {
 
 qtConfig(force_asserts): gn_args += dcheck_always_on=true
 
-qtConfig(build-qtpdf) {
-    qtConfig(pdf-v8) {
-        gn_args += pdf_enable_v8=true
-    } else {
-        gn_args += pdf_enable_v8=false
-    }
-    qtConfig(pdf-xfa) {
-        gn_args += pdf_enable_xfa=true
-    } else {
-        gn_args += pdf_enable_xfa=false
-    }
-    qtConfig(pdf-xfa-bmp) {
-        gn_args += pdf_enable_xfa_bmp=true
-    } else {
-        gn_args += pdf_enable_xfa_bmp=false
-    }
-    qtConfig(pdf-xfa-gif) {
-        gn_args += pdf_enable_xfa_gif=true
-    } else {
-        gn_args += pdf_enable_xfa_gif=false
-    }
-    qtConfig(pdf-xfa-png) {
-        gn_args += pdf_enable_xfa_png=true
-    } else {
-        gn_args += pdf_enable_xfa_png=false
-    }
-    qtConfig(pdf-xfa-tiff) {
-        gn_args += pdf_enable_xfa_tiff=true
-    } else {
-        gn_args += pdf_enable_xfa_tiff=false
-    }
-}
-
diff --git a/src/buildtools/config/ios.pri b/src/buildtools/config/ios.pri
index ff93e0bf3..5dc7faf9d 100644
--- a/src/buildtools/config/ios.pri
+++ b/src/buildtools/config/ios.pri
@@ -39,13 +39,7 @@ ios_enable_code_signing=false \
 target_os=\"ios\" \
 ios_deployment_target=\"$${QMAKE_IOS_DEPLOYMENT_TARGET}\" \
 enable_ios_bitcode=true \
-use_jumbo_build=false \
-pdf_enable_v8=false \
-pdf_enable_xfa=false \
-pdf_enable_xfa_bmp=false \
-pdf_enable_xfa_gif=false \
-pdf_enable_xfa_png=false \
-pdf_enable_xfa_tiff=false
+use_jumbo_build=false
 
 device:simulator {
   # we do fat libray
diff --git a/src/buildtools/config/pdf.pri b/src/buildtools/config/pdf.pri
new file mode 100644
index 000000000..4a1cf08e0
--- /dev/null
+++ b/src/buildtools/config/pdf.pri
@@ -0,0 +1,36 @@
+include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri)
+QT_FOR_CONFIG += pdf-private
+
+qtConfig(build-qtpdf) {
+    qtConfig(pdf-v8) {
+        gn_args += pdf_enable_v8=true
+    } else {
+        gn_args += pdf_enable_v8=false
+    }
+    qtConfig(pdf-xfa) {
+        gn_args += pdf_enable_xfa=true
+    } else {
+        gn_args += pdf_enable_xfa=false
+    }
+    qtConfig(pdf-xfa-bmp) {
+        gn_args += pdf_enable_xfa_bmp=true
+    } else {
+        gn_args += pdf_enable_xfa_bmp=false
+    }
+    qtConfig(pdf-xfa-gif) {
+        gn_args += pdf_enable_xfa_gif=true
+    } else {
+        gn_args += pdf_enable_xfa_gif=false
+    }
+    qtConfig(pdf-xfa-png) {
+        gn_args += pdf_enable_xfa_png=true
+    } else {
+        gn_args += pdf_enable_xfa_png=false
+    }
+    qtConfig(pdf-xfa-tiff) {
+        gn_args += pdf_enable_xfa_tiff=true
+    } else {
+        gn_args += pdf_enable_xfa_tiff=false
+    }
+}
+
diff --git a/src/pdf/configure.json b/src/pdf/configure.json
index 48e68333e..1f21183a2 100644
--- a/src/pdf/configure.json
+++ b/src/pdf/configure.json
@@ -12,6 +12,7 @@
              "label": "Support V8",
              "purpose": "Enables javascript support.",
              "autoDetect": "false",
+             "condition": "!config.ios",
              "output": ["privateFeature" ]
           },
          "pdf-xfa": {
diff --git a/src/pdf/gn_run.pro b/src/pdf/gn_run.pro
index fe35f8eb4..7fd4d4ffc 100644
--- a/src/pdf/gn_run.pro
+++ b/src/pdf/gn_run.pro
@@ -30,6 +30,8 @@ build_pass|!debug_and_release {
     # fixme: refine args
     gn_args = $$gnArgs()
 
+    include($$QTWEBENGINE_ROOT/src/buildtools/config/pdf.pri)
+
     # fixme: qtwebengine_target
     gn_args += "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtPdf\""