Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
    src/3rdparty

Change-Id: Ie7b7c469aa24716816a23b8fe7a8df9f477a9f67

4 files changed, 6 insertions, 2 deletions

diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 7a9656fca..b5bb23684 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -2,8 +2,6 @@
 
 # Trigger Qt-specific build conditions.
 GYP_CONFIG += use_qt=1
-# Enable printing. We enable preview because we use preview logic even if we don't support preview.
-GYP_CONFIG += enable_basic_printing=1 enable_print_preview=1
 # We do not want to ship more external binary blobs, so let v8 embed its startup data.
 GYP_CONFIG += v8_use_external_startup_data=0
 # WebSpeech requires Google API keys and adds dependencies on speex and flac.
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index e28d7eb7c..23044619b 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -5,6 +5,8 @@ include(linux.pri)
 GYP_CONFIG += \
     desktop_linux=1 \
     enable_widevine=1 \
+    enable_basic_printing=1 \
+    enable_print_preview=1 \
     enable_pdf=1
 
 clang {
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index be037cbde..4111236ed 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -26,6 +26,8 @@ GYP_CONFIG += \
     make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \
     clang_use_chrome_plugins=0 \
     enable_widevine=1 \
+    enable_basic_printing=1 \
+    enable_print_preview=1 \
     enable_pdf=1
 
 # Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index 9564cf9b7..a1c116ff8 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -7,6 +7,8 @@ GYP_CONFIG += \
     remoting=0 \
     use_ash=0 \
     enable_widevine=1 \
+    enable_basic_printing=1 \
+    enable_print_preview=1 \
     enable_pdf=1
 
 # Libvpx build needs additional search path on Windows.