diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-22 16:33:53 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-23 08:37:30 +0000 |
| commit | ea65bb32fa988b37d030c3737b8a036f049d1354 (patch) | |
| tree | 616e5974150ded2cbb32abf0ebb5648da9bccae2 | |
| parent | 1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b (diff) | |
Switch to setting 'official build' for non developer builds
Some things controlled by the OFFICIAL_BUILD defined are commented as
unsafe to ship in production, so we need that as well.
Note that GOOGLE_CHROME and OFFICIAL_BUILD are two different settings,
so this just denotes the build as one shipped in production.
Change-Id: I1fdcfec7f5c5142dd2bdc5f1d1f9a296a60e5708
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/common.pri | 7 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/windows.pri | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 69388ae5e24df85a68354c3b330514756129d87 +Subproject 2e319c154da8361d449e8238ece3d65e5451f7b diff --git a/src/core/config/common.pri b/src/core/config/common.pri index ddb4ca4bf..c8c3d55f6 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -60,6 +60,13 @@ precompile_header { gn_args += enable_precompiled_headers=false } +CONFIG(release, debug|release):!isDeveloperBuild() { + gn_args += is_official_build=true +} else { + gn_args += is_official_build=false + !isDeveloperBuild(): gn_args += is_unsafe_developer_build=false +} + CONFIG(release, debug|release) { gn_args += is_debug=false force_debug_info { diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 85b948db2..9fc8c6e82 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -10,6 +10,7 @@ gn_args += \ use_bundled_fontconfig=false \ use_sysroot=false \ enable_session_service=false \ + is_cfi=false \ toolkit_views=false \ use_ozone=true \ ozone_auto_platforms=false \ diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 3b42a0b9a..9eb15830d 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -6,7 +6,8 @@ gn_args += \ enable_session_service=false \ ninja_use_custom_environment_files=false \ is_multi_dll_chrome=false \ - win_linker_timing=true + win_linker_timing=true \ + com_init_check_hook_disabled=true isDeveloperBuild() { gn_args += \ |