1 files changed, 38 insertions, 7 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index 7f87e885d..405004834 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -2,14 +2,20 @@ GYP_ARGS += "-D qt_os=\"win32\" -I config/windows.gypi"
 
 include(common.pri)
 
+gn_args += \
+    is_clang=false \
+    use_sysroot=false \
+    use_kerberos=true \
+    enable_notifications=false \
+    enable_session_service=false \
+    ninja_use_custom_environment_files=false \
+    is_multi_dll_chrome=false \
+    win_linker_timing=true
+
 GYP_CONFIG += \
     disable_nacl=1 \
     remoting=0 \
-    use_ash=0 \
-    enable_widevine=1 \
-    enable_basic_printing=1 \
-    enable_print_preview=1 \
-    enable_pdf=1
+    use_ash=0
 
 # Libvpx build needs additional search path on Windows.
 GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$${getChromiumSrcDir()}\""
@@ -20,11 +26,29 @@ 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"
 
+
+isDeveloperBuild() {
+    gn_args += \
+        is_win_fastlink=true \
+        use_incremental_linking=true
+} else {
+    gn_args += \
+        use_incremental_linking=false
+}
+
 qtConfig(angle) {
+    #FIXME: Expect LIBQTANGLE_NAME to be always set
+    #FIXME: Replace qt_egl_library and qt_glesv2_library into qt_angle_library
+    LIB_EGL=libEGL
+    LIB_GLESV2=libGLESv2
+    !isEmpty(LIBQTANGLE_NAME) {
+        LIB_EGL=$$LIBQTANGLE_NAME
+        LIB_GLESV2=$$LIBQTANGLE_NAME
+    }
     CONFIG(release, debug|release) {
-        GYP_ARGS += "-D qt_egl_library=\"libEGL.lib\" -D qt_glesv2_library=\"libGLESv2.lib\""
+        GYP_ARGS += "-D qt_egl_library=\"$${LIB_EGL}.lib\" -D qt_glesv2_library=\"$${LIB_GLESV2}.lib\""
     } else {
-        GYP_ARGS += "-D qt_egl_library=\"libEGLd.lib\" -D qt_glesv2_library=\"libGLESv2d.lib\""
+        GYP_ARGS += "-D qt_egl_library=\"$${LIB_EGL}d.lib\" -D qt_glesv2_library=\"$${LIB_GLESV2}d.lib\""
     }
     GYP_ARGS += "-D qt_gl=\"angle\""
 } else {
@@ -66,7 +90,14 @@ msvc {
     }
 
     GYP_ARGS += "-G msvs_version=$$MSVS_VERSION"
+    gn_args += visual_studio_version=$$MSVS_VERSION
+
+    SDK_PATH = $$(WINDOWSSDKDIR)
+    VS_PATH= $$(VSINSTALLDIR)
+    gn_args += visual_studio_path=$$shell_quote($$VS_PATH)
+    gn_args += windows_sdk_path=$$shell_quote($$SDK_PATH)
 
+    contains(QT_ARCH, "i386"): gn_args += target_cpu=\"x86\"
     isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/10\""
 
 } else {