Enable PDF for desktop platforms and add chromium dependencies

PDF is enabled globally, but disabled for the embedded platforms
currently

Change-Id: I44e1ffc8587ff8d8e677a47f8048feaef2e3266a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

7 files changed, 15 insertions, 3 deletions

diff --git a/src/3rdparty b/src/3rdparty
-Subproject 73ce027510183c151bb792433f36eb143aff72f
+Subproject 55be8abc690b546fb97f97623387e0999b7cbce
diff --git a/src/core/chrome_qt.gyp b/src/core/chrome_qt.gyp
index e5486498a..e6ddddf99 100644
--- a/src/core/chrome_qt.gyp
+++ b/src/core/chrome_qt.gyp
@@ -96,6 +96,13 @@
             '<(DEPTH)/chrome/renderer/pepper/pepper_shared_memory_message_filter.h',
           ],
         }],
+        ['enable_pdf==1', {
+          'dependencies': [
+            '<(chromium_src_dir)/pdf/pdf.gyp:pdf',
+            '<(chromium_src_dir)/components/components.gyp:pdf_renderer',
+            '<(chromium_src_dir)/components/components.gyp:pdf_browser',
+          ],
+        }],
         ['enable_spellcheck==1', {
           'sources': [ '<@(chrome_spellchecker_sources)' ],
           'include_dirs': [
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index de0fbbc6b..46d500207 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -4,7 +4,8 @@ include(linux.pri)
 
 GYP_CONFIG += \
     desktop_linux=1 \
-    enable_widevine=1
+    enable_widevine=1 \
+    enable_pdf=1
 
 clang {
     GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index c8f0b82de..844877e03 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -15,6 +15,7 @@ GYP_CONFIG += \
     enable_google_now=0 \
     enable_language_detection=0 \
     enable_managed_users=0 \
+    enable_pdf=0 \
     enable_plugin_installation=0 \
     enable_plugins=0 \
     enable_print_preview=0 \
diff --git a/src/core/config/embedded_qnx.pri b/src/core/config/embedded_qnx.pri
index c05e8bb59..3effdb816 100644
--- a/src/core/config/embedded_qnx.pri
+++ b/src/core/config/embedded_qnx.pri
@@ -5,6 +5,7 @@ include(common.pri)
 GYP_CONFIG += \
     disable_nacl=1 \
     enable_basic_printing=0 \
+    enable_pdf=0 \
     enable_plugins=0 \
     enable_webrtc=0 \
     use_ash=0 \
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index c447add4a..55601ded9 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -25,7 +25,8 @@ GYP_CONFIG += \
     mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
     make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \
     clang_use_chrome_plugins=0 \
-    enable_widevine=1
+    enable_widevine=1 \
+    enable_pdf=1
 
 # Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we
 # disable the API usage if the SDK version is lower.
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index 46dc6931a..5b9551b5a 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -6,7 +6,8 @@ GYP_CONFIG += \
     disable_nacl=1 \
     remoting=0 \
     use_ash=0 \
-    enable_widevine=1
+    enable_widevine=1 \
+    enable_pdf=1
 
 # Libvpx build needs additional search path on Windows.
 GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$${getChromiumSrcDir()}\""