From 5e40d3d982d014cd01db4dbe6aecc6ea6baf840a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 31 May 2019 13:35:04 -0700 Subject: qfloat16: Check in the tables to Git It's a 38k source file, which makes it MUCH smaller than other generated files like qlocale_data_p.h (982k) and qunicodetables.cpp (718k). The constants are platform-independent, since they are defined by IEEE 754, so they will never change. The generator tool is moved to util/ and removed from the build. That's one fewer bootstrapped tool to have to worry about. The output file is committed as .cpp so it won't get installed. Fixes: QTBUG-76165 Change-Id: I2b1955a995ad40f3b89afffd15a3ded58dc3e35f Reviewed-by: Allan Sandfeld Jensen --- src/src.pro | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index a39b718e10..b1afdd27a5 100644 --- a/src/src.pro +++ b/src/src.pro @@ -21,10 +21,6 @@ src_tools_rcc.subdir = tools/rcc src_tools_rcc.target = sub-rcc src_tools_rcc.depends = src_tools_bootstrap -src_tools_qfloat16_tables.subdir = tools/qfloat16-tables -src_tools_qfloat16_tables.target = sub-qfloat16-tables -src_tools_qfloat16_tables.depends = src_tools_bootstrap - src_tools_qlalr.subdir = tools/qlalr src_tools_qlalr.target = sub-qlalr force_bootstrap: src_tools_qlalr.depends = src_tools_bootstrap @@ -72,7 +68,7 @@ src_winmain.depends = sub-corelib # just for the module .pri file src_corelib.subdir = $$PWD/corelib src_corelib.target = sub-corelib -src_corelib.depends = src_tools_moc src_tools_rcc src_tools_qfloat16_tables +src_corelib.depends = src_tools_moc src_tools_rcc src_xml.subdir = $$PWD/xml src_xml.target = sub-xml @@ -159,12 +155,12 @@ src_android.subdir = $$PWD/android src_3rdparty_freetype.depends += src_corelib } } -SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qfloat16_tables +SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc qtConfig(regularexpression):pcre2 { SUBDIRS += src_3rdparty_pcre2 src_corelib.depends += src_3rdparty_pcre2 } -TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr src_tools_qfloat16_tables +TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr !force_bootstrap:if(qtConfig(lttng)|qtConfig(etw)) { SUBDIRS += src_tools_tracegen src_corelib.depends += src_tools_tracegen -- cgit v1.2.3