1 files changed, 16 insertions, 14 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index b0723e333..d8a4fa181 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -4,46 +4,44 @@ gn_args += \
     use_qt=true \
     is_component_build=false \
     is_shared=true \
-    enable_media_router=false \
     enable_nacl=false \
     enable_remoting=false \
     enable_web_speech=false \
-    use_experimental_allocator_shim=false \
+    use_allocator_shim=false \
     use_allocator=\"none\" \
     v8_use_external_startup_data=false \
-    treat_warnings_as_errors=false
+    treat_warnings_as_errors=false \
+    enable_swiftshader=false \
+    use_custom_libcxx=false \
+    use_jumbo_build=true
 
-use?(printing) {
+qtConfig(webengine-printing-and-pdf) {
     gn_args += enable_basic_printing=true enable_print_preview=true
-} else {
-    gn_args += enable_basic_printing=false enable_print_preview=false
-}
-
-use?(pdf) {
     gn_args += enable_pdf=true
 } else {
+    gn_args += enable_basic_printing=false enable_print_preview=false
     gn_args += enable_pdf=false
 }
 
-use?(pepper_plugins) {
+qtConfig(webengine-pepper-plugins) {
     gn_args += enable_plugins=true enable_widevine=true
 } else {
     gn_args += enable_plugins=false enable_widevine=false
 }
 
-use?(spellchecker) {
+qtConfig(webengine-spellchecker) {
     gn_args += enable_spellcheck=true
 } else {
     gn_args += enable_spellcheck=false
 }
 
-use?(webrtc) {
+qtConfig(webengine-webrtc) {
     gn_args += enable_webrtc=true
 } else {
     gn_args += enable_webrtc=false
 }
 
-use?(proprietary_codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
+qtConfig(webengine-proprietary-codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
 CONFIG(release, debug|release) {
     force_debug_info {
@@ -55,8 +53,12 @@ CONFIG(release, debug|release) {
     }
 }
 
+CONFIG(debug, debug|release) {
+    gn_args += use_debug_fission=false
+}
+
 !webcore_debug: gn_args += remove_webcore_debug_symbols=true
 !v8base_debug: gn_args += remove_v8base_debug_symbols=true
 
 # Compiling with -Os makes a huge difference in binary size
-contains(WEBENGINE_CONFIG, reduce_binary_size): gn_args += optimize_for_size=true
+optimize_size: gn_args += optimize_for_size=true