diff options
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 3785ddc46..55b20cda2 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + MODULE = webenginecore include(core_common.pri) @@ -47,7 +50,17 @@ CONFIG *= no_smart_library_merge osx { LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a } else:msvc { - QMAKE_LFLAGS += /OPT:REF + !isDeveloperBuild() { + # Remove unused functions and data in debug non-developer builds, because the binaries will + # be smaller in the shipped packages. + QMAKE_LFLAGS += /OPT:REF + } else:CONFIG(debug, debug|release) { + # Make sure to override qtbase's QMAKE_LFLAGS_DEBUG option in debug developer builds, + # because qmake chooses and overrides the option when it gets appended to QMAKE_LFLAGS in + # qtbase\mkspecs\features\default_post.prf, regardless of what Chromium passes back from GN. + QMAKE_LFLAGS_DEBUG -= /DEBUG + QMAKE_LFLAGS_DEBUG += /DEBUG:FASTLINK + } QMAKE_LFLAGS += /WHOLEARCHIVE:$${api_library_path}$${QMAKE_DIR_SEP}$${api_library_name}.lib } else { LIBS_PRIVATE += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive @@ -100,7 +113,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat resources.path = $$[QT_INSTALL_DATA]/resources INSTALLS += locales resources - !use?(system_icu) { + !qtConfig(system-icu) { icu.CONFIG += no_check_exist icu.path = $$[QT_INSTALL_DATA]/resources INSTALLS += icu @@ -112,7 +125,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat # Copy essential files to the qtbase build directory for non-prefix builds # - !use?(system_icu) { + !qtConfig(system-icu) { COPIES += icu } |