7 files changed, 36 insertions, 42 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 3441d9623..6b79a1f99 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -1,13 +1,19 @@
 # Shared configuration for all our supported platforms
+include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri)
+QT_FOR_CONFIG += webenginecore
 
 gn_args += \
     use_qt=true \
     is_component_build=false \
     is_shared=true \
+    enable_message_center=false \
+    enable_mus=false \
     enable_nacl=false \
     enable_remoting=false \
     enable_reporting=false \
     enable_web_speech=false \
+    enable_widevine=true \
+    has_native_accessibility=false \
     use_allocator_shim=false \
     use_allocator=\"none\" \
     v8_use_external_startup_data=false \
@@ -17,8 +23,7 @@ gn_args += \
 
 !win32: gn_args += \
     use_jumbo_build=true \
-    jumbo_file_merge_limit=8 \
-    jumbo_build_excluded="[\"browser\",\"renderer\"]"
+    jumbo_file_merge_limit=8
 
 qtConfig(webengine-printing-and-pdf) {
     gn_args += enable_basic_printing=true enable_print_preview=true
@@ -29,9 +34,9 @@ qtConfig(webengine-printing-and-pdf) {
 }
 
 qtConfig(webengine-pepper-plugins) {
-    gn_args += enable_plugins=true enable_widevine=true
+    gn_args += enable_plugins=true
 } else {
-    gn_args += enable_plugins=false enable_widevine=false
+    gn_args += enable_plugins=false
 }
 
 qtConfig(webengine-spellchecker) {
@@ -94,4 +99,10 @@ qtConfig(webengine-v8-snapshot) {
     gn_args += v8_use_snapshot=false
 }
 
+qtConfig(webengine-kerberos) {
+    gn_args += use_kerberos=true
+} else {
+    gn_args += use_kerberos=false
+}
+
 !msvc: gn_args += enable_iterator_debugging=false
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
deleted file mode 100644
index 70f1cf81e..000000000
--- a/src/core/config/desktop_linux.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-include(linux.pri)
-
-gn_args += \
-    use_sysroot=false \
-    enable_session_service=false \
-    toolkit_views=false
-
-!use_gold_linker: gn_args += use_gold=false
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
deleted file mode 100644
index 8d9f09deb..000000000
--- a/src/core/config/embedded_linux.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-include(linux.pri)
-
-gn_args += \
-    is_desktop_linux=false \
-    use_gold=false \
-    use_ozone=true \
-    use_sysroot=false \
-    enable_session_service=false \
-    ozone_auto_platforms=false \
-    ozone_platform_headless=true \
-    ozone_platform_external=true \
-    ozone_platform=\"qt\" \
-    toolkit_views=false
diff --git a/src/core/config/embedded_qnx.pri b/src/core/config/embedded_qnx.pri
deleted file mode 100644
index f24888776..000000000
--- a/src/core/config/embedded_qnx.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-GYP_ARGS += "-D qt_os=\"embedded_qnx\" -I config/embedded_qnx.gypi"
-
-include(common.pri)
-
-GYP_CONFIG += \
-    disable_nacl=1 \
-    enable_webrtc=0 \
-    use_ash=0 \
-    use_aura=1 \
-    use_ozone=1 \
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 4ade28271..eb8bb7bb0 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -1,17 +1,32 @@
 include(common.pri)
-include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
-QT_FOR_CONFIG += gui-private webengine-private
+QT_FOR_CONFIG += gui-private webenginecore-private
 
 gn_args += \
     use_cups=false \
     use_gio=false \
     use_gnome_keyring=false \
-    use_kerberos=false \
     linux_use_bundled_binutils=false \
     use_udev=true \
-    use_bundled_fontconfig=false
+    use_bundled_fontconfig=false \
+    use_sysroot=false \
+    enable_session_service=false \
+    toolkit_views=false \
+    use_ozone=true \
+    ozone_auto_platforms=false \
+    ozone_platform_headless=false \
+    ozone_platform_external=true \
+    ozone_platform=\"qt\"
+
+qtConfig(webengine-embedded-build) {
+    gn_args += is_desktop_linux=false
+    gn_args += use_gold=false
+} else {
+    !use_gold_linker: gn_args += use_gold=false
+}
 
-gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true
+qtConfig(webengine-system-x11): hasX11Dependencies() {
+   gn_args += ozone_platform_x11=true
+}
 
 clang {
     clang_full_path = $$which($${QMAKE_CXX})
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 2d820c889..4426901cf 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -24,11 +24,11 @@ system("$${QMAKE_CLANG_PATH} --version")
 gn_args += \
     is_clang=true \
     use_sysroot=false \
-    use_kerberos=false \
     clang_base_path=\"$${QMAKE_CLANG_DIR}\" \
     clang_use_chrome_plugins=false \
     mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
     mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
+    mac_views_browser=false \
     toolkit_views=false \
     use_external_popup_menu=false
 
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index 5aa511da3..3b42a0b9a 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -3,7 +3,6 @@ include(common.pri)
 gn_args += \
     is_clang=false \
     use_sysroot=false \
-    use_kerberos=true \
     enable_session_service=false \
     ninja_use_custom_environment_files=false \
     is_multi_dll_chrome=false \