diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-25 15:09:31 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-01 12:06:20 +0000 |
| commit | ab94349cb2fa073e8aec661a797de1cfc3819752 (patch) | |
| tree | d3525f63aa9b3ff041989d5cf981e0ee8b07d77d /src/core/config/windows.pri | |
| parent | cb6564b11ea0a81155b59ab178ff75148017a952 (diff) | |
Simple adaptations to Chromium 55
The simplest adaptations to API and build changes in Chromium 55
Change-Id: I923fa188690a04902492317807f72f006bcab9c6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/config/windows.pri')
| -rw-r--r-- | src/core/config/windows.pri | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 334675481..d5b50842e 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -2,6 +2,16 @@ 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_link_timing=true + GYP_CONFIG += \ disable_nacl=1 \ remoting=0 \ @@ -16,6 +26,16 @@ 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 @@ -70,6 +90,12 @@ 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) isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/10\"" |