From edf90a9e865592ba09d495c6264b31e72a4d2d52 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@theqtcompany.com>
Date: Thu, 6 Oct 2016 21:07:13 +0200
Subject: [PATCH] Change linking information for qwebengine_convert_dict
Use convert_dict_linking.pri instead of QtWebEngineCore_linking.pri
for qwebengine_convert_dict linking step. New linking information
contains only required dependencies, so linker should have much
less work to resolve all the symbols.
The target change to executable is also required to
generate convert_dict_linking.pri
Task-number: QTBUG-53135
Change-Id: I1432207bd1853e762d5d8291ce61027592fd0161
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
src/3rdparty | 2 +-
src/core/chrome_qt.gyp | 2 +-
.../qwebengine_convert_dict/qwebengine_convert_dict.pro | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index 7824a683f..600b27325 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 7824a683f0d5c93e6b8fd5dfc75d51d06167f0c4
+Subproject commit 600b273256015db194640549e57199cef6e07902
diff --git a/src/core/chrome_qt.gyp b/src/core/chrome_qt.gyp
index 547f240ea..3fa2625a8 100644
--- a/src/core/chrome_qt.gyp
+++ b/src/core/chrome_qt.gyp
@@ -113,7 +113,7 @@
'<(chromium_src_dir)/third_party/WebKit',
],
'dependencies': [
- '<(chromium_src_dir)/chrome/tools/convert_dict/convert_dict.gyp:convert_dict_lib',
+ '<(chromium_src_dir)/chrome/tools/convert_dict/convert_dict.gyp:convert_dict',
'<(chromium_src_dir)/third_party/hunspell/hunspell.gyp:hunspell',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
index 1781b843d..715081b5f 100644
--- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
+++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
@@ -1,10 +1,11 @@
option(host_build)
# Look for linking information produced by gyp for our target according to core_generated.gyp
-!include($$OUT_PWD/../../core/$$getConfigDir()/QtWebEngineCore_linking.pri) {
+!include($$OUT_PWD/../../core/$$getConfigDir()/convert_dict_linking.pri) {
error("Could not find the linking information that gyp should have generated.")
}
-# remove object files from linking information
+
+# skip dummy main.cpp file
OBJECTS =
# Fixme: -Werror=unused-parameter in core
--
GitLab