diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-01 18:22:21 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-01 19:03:09 +0100 |
| commit | 3d0d0afe573d1c568f1f5c0eba647eff993dcb81 (patch) | |
| tree | 4c05b09f478233f3156c7f4c1a5cb0fb5ee2a597 /src/core/core_module.pro | |
| parent | 30aa9c7bf0f1eceda8516fd5de87dc8e2cff1758 (diff) | |
| parent | 399d77a38ff52d33dc871a5b221db253308b7436 (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/core/core_module.pro
src/core/delegated_frame_node.cpp
src/core/surface_factory_qt.cpp
src/webenginewidgets/api/qwebengineprofile.cpp
tests/auto/widgets/widgets.pro
Change-Id: I92f3ef4eee779afef6c5381a7aa8b551417c1b17
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 55b20cda2..78bb8baee 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -61,7 +61,9 @@ osx { QMAKE_LFLAGS_DEBUG -= /DEBUG QMAKE_LFLAGS_DEBUG += /DEBUG:FASTLINK } - QMAKE_LFLAGS += /WHOLEARCHIVE:$${api_library_path}$${QMAKE_DIR_SEP}$${api_library_name}.lib + # Simulate -whole-archive by passing the list of object files that belong to the public + # API library as response file to the linker. + QMAKE_LFLAGS += @$${api_library_path}$${QMAKE_DIR_SEP}$${api_library_name}.lib.objects } else { LIBS_PRIVATE += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive } |