summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2016-10-06 21:07:13 +0200
committerMichal Klocek <michal.klocek@qt.io>2016-10-17 08:00:41 +0000
commitedf90a9e865592ba09d495c6264b31e72a4d2d52 (patch)
treeffeac1a2e8f50085e575bf0491de117fdf42cd45 /src/tools
parent916c6b921246c3214b518886278990347fc00e21 (diff)
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>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro5
1 files changed, 3 insertions, 2 deletions
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