summaryrefslogtreecommitdiffstats
path: root/src/core/core_gyp_generator.pro
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-09-15 10:54:45 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-09-24 08:44:42 +0000
commit0c6147d9b5ffbe18bfe1e8deb9cc128c9a0fad27 (patch)
treefed576ea2494760069ebd18cabd2c01f54aa3b31 /src/core/core_gyp_generator.pro
parent6e3485d32698626534acd76ba322d58878dd8b79 (diff)
fix debug_and_release build on Windows
The public API symbols are compiled in a static library that's linked to core with --whole-archive when using gcc. There's no equivalent for this in MSVC. We hacked around this limitation in commit 38944be4 by creating a source file that includes every public header. Unfortunately this breaks debug_and_release builds, because we must inject this generated source file as absolute path, and gyp will generate the same object file for every source file that's specified with an absolute path... This reverts commit 38944be4 and replaces the work-around by simulating -whole-archive on MSVC. This is done by passing all object files that belong to qtwebenginecoreapi.lib to the linker via a response file that is created when building qtwebenginecoreapi.lib. Task-number: QTBUG-48376 Change-Id: Iaa991fe96a2c336d982d29d6924ce950c0be5398 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/core/core_gyp_generator.pro')
-rw-r--r--src/core/core_gyp_generator.pro15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 17d73ccfd..c1b8179e0 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -178,18 +178,3 @@ qtHaveModule(positioning) {
HEADERS += location_provider_qt.h
DEFINES += QT_USE_POSITIONING=1
}
-
-win32:msvc {
- EXPORTS_CPP = $$OUT_PWD/api/public_exports.cpp
- !build_pass {
- API_HEADERS = $$files($$PWD/api/*.h)
- CONTENT = "// Dummy C++ file to make sure API symbols are exported."
- for(f, API_HEADERS) {
- CONTENT += "$${LITERAL_HASH}include <$$basename(f)>"
- }
- write_file($$EXPORTS_CPP, CONTENT)
- unset(API_HEADERS)
- unset(CONTENT)
- }
- SOURCES += $$EXPORTS_CPP
-}