7 files changed, 42 insertions, 19 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 5822bc589..7a9656fca 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -2,11 +2,16 @@
 
 # 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
-# Disable printing since we don't support it yet
-GYP_CONFIG += enable_basic_printing=1 enable_print_preview=0
 # WebSpeech requires Google API keys and adds dependencies on speex and flac.
 GYP_CONFIG += enable_web_speech=0
 # We do not use or even include the extensions
 GYP_CONFIG += enable_extensions=0
+
+sanitize_address: GYP_CONFIG += asan=1
+sanitize_thread: GYP_CONFIG += tsan=1
+sanitize_memory: GYP_CONFIG += msan=1
+sanitize_undefined: GYP_CONFIG += ubsan=1
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index de0fbbc6b..e28d7eb7c 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -4,10 +4,15 @@ 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
+    GYP_CONFIG += werror=
+    clang_full_path = $$which($${QMAKE_CXX})
+    # Remove the "/bin/clang++" part.
+    clang_prefix = $$section(clang_full_path, /, 0, -3)
+    GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=$${clang_prefix}
     linux-clang-libc++: GYP_CONFIG += use_system_libcxx=1
 } else {
     GYP_CONFIG += clang=0 host_clang=0
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index 4cb7d89fb..7a909f1e2 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -15,9 +15,10 @@ 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_printing=0 \
+    enable_print_preview=0 \
     enable_session_service=0 \
     enable_task_manager=0 \
     enable_themes=0 \
@@ -38,5 +39,6 @@ GYP_CONFIG += \
     use_x11=0 \
     v8_use_snapshot=false \
     want_separate_host_toolset=1 \
+    angle_enable_gl=0 \
 
 WEBENGINE_CONFIG *= reduce_binary_size
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/linux.pri b/src/core/config/linux.pri
index a318e170c..83c852f86 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -1,4 +1,5 @@
 include(common.pri)
+QT_FOR_CONFIG += gui-private
 
 # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug)
 # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system.
@@ -22,19 +23,24 @@ GYP_CONFIG += \
     use_openssl=1
 
 use?(nss) {
-    GYP_CONFIG += use_nss_certs=1 \
+    GYP_CONFIG += \
+        use_nss_certs=1 \
+        use_nss_verifier=1 \
         use_openssl_certs=0
 } else {
-    GYP_CONFIG += use_nss_certs=0 \
+    GYP_CONFIG += \
+        use_nss_certs=0 \
+        use_nss_verifier=0 \
         use_openssl_certs=1
 }
 
 gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += no_delete_null_pointer_checks=1
 
-contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
-contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
-contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
-contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
+qtConfig(system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
+qtConfig(system-png): GYP_CONFIG += use_system_libpng=1
+qtConfig(system-jpeg): GYP_CONFIG += use_system_libjpeg=1
+qtConfig(system-harfbuzz): use?(system_harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
+!qtConfig(glib): GYP_CONFIG += use_glib=0
 contains(QT_CONFIG, pulseaudio) {
     GYP_CONFIG += use_pulseaudio=1
 } else {
@@ -45,7 +51,6 @@ contains(QT_CONFIG, alsa) {
 } else {
     GYP_CONFIG += use_alsa=0
 }
-!contains(QT_CONFIG, glib): GYP_CONFIG += use_glib=0
 use?(system_libevent): GYP_CONFIG += use_system_libevent=1
 use?(system_libwebp):  GYP_CONFIG += use_system_libwebp=1
 use?(system_libsrtp):  GYP_CONFIG += use_system_libsrtp=1
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index c447add4a..be037cbde 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -25,11 +25,17 @@ 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.
 !isMinOSXSDKVersion(10, 10, 3): GYP_CONFIG += disable_force_touch=1
 
+# Pass a supported -fstack-protect flag depending on Xcode version.
+lessThan(QMAKE_XCODE_VERSION, 6.3) {
+  GYP_CONFIG += use_xcode_stack_protector_strong=0
+}
+
 QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)"
 exists($$QMAKE_MAC_SDK_PATH): GYP_CONFIG += mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\"
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index a99bc5303..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()}\""
@@ -17,7 +18,7 @@ GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"
 # Gyp's parallel processing is broken on Windows
 GYP_ARGS += "--no-parallel"
 
-contains(QT_CONFIG, angle) {
+qtConfig(angle) {
     CONFIG(release, debug|release) {
         GYP_ARGS += "-D qt_egl_library=\"libEGL.lib\" -D qt_glesv2_library=\"libGLESv2.lib\""
     } else {
@@ -56,9 +57,7 @@ msvc:contains(QT_ARCH, "i386"):!usingMSVC32BitCrossCompiler() {
 }
 
 msvc {
-    equals(MSVC_VER, 12.0) {
-        MSVS_VERSION = 2013
-    } else:equals(MSVC_VER, 14.0) {
+    equals(MSVC_VER, 14.0) {
         MSVS_VERSION = 2015
     } else {
         fatal("Visual Studio compiler version \"$$MSVC_VER\" is not supported by Qt WebEngine")
@@ -66,7 +65,7 @@ msvc {
 
     GYP_ARGS += "-G msvs_version=$$MSVS_VERSION"
 
-    isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/8.1\""
+    isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/10\""
 
 } else {
     fatal("Qt WebEngine for Windows can only be built with the Microsoft Visual Studio C++ compiler")