diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-01-20 18:47:22 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-02-01 14:31:30 +0100 |
| commit | 658b93386eea34398de3ddacab436601e1ab5bbb (patch) | |
| tree | ee37dcaa755bd7b557d36fbcfd11bd6f7d89af8d /src/corelib | |
| parent | 784c443ab02d2a53e3a746c122e10e0f494a869e (diff) | |
Update double-conversion library to current master
Turned our local diffs into a side-branch in the upstream repo, got
material changes upstreamed (leaving only our #include changes),
rebased it to master, copied back to our version. Upstream has made no
new release since 3.1.5 in 2019 May, but there is substantial change
since then, including acceptance of our upstreaming. Our patches have
been refined in the process of upstreaming.
The list of source files is slightly changed. The double-conversion.*
files are split in two, string-to-double.* and double-to-string.*, but
the old double-conversion.h header is retained, simply pulling in its
two halves. These thus need to be present in the include directory.
Changed the patches/ directory to be in git format-patch form, for
sending or applying to the upstream repo, before copying files into
the qtbase source tree. This should make future upstreaming easier.
Task-number: QTBUG-90214
Change-Id: Id94198f58ef7bdf02af117c35cb9678b5c34ac0e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 31ba8272fc..1abe6588d9 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -744,19 +744,28 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion qt_internal_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion SOURCES - ../3rdparty/double-conversion/bignum.cc ../3rdparty/double-conversion/bignum.h - ../3rdparty/double-conversion/bignum-dtoa.cc ../3rdparty/double-conversion/bignum-dtoa.h - ../3rdparty/double-conversion/cached-powers.cc ../3rdparty/double-conversion/cached-powers.h - ../3rdparty/double-conversion/diy-fp.cc ../3rdparty/double-conversion/diy-fp.h - ../3rdparty/double-conversion/double-conversion.cc - ../3rdparty/double-conversion/fast-dtoa.cc ../3rdparty/double-conversion/fast-dtoa.h - ../3rdparty/double-conversion/fixed-dtoa.cc ../3rdparty/double-conversion/fixed-dtoa.h + ../3rdparty/double-conversion/cached-powers.h + ../3rdparty/double-conversion/double-to-string.cc ../3rdparty/double-conversion/ieee.h - ../3rdparty/double-conversion/include/double-conversion/double-conversion.h + ../3rdparty/double-conversion/fast-dtoa.cc + ../3rdparty/double-conversion/diy-fp.h + ../3rdparty/double-conversion/strtod.h + ../3rdparty/double-conversion/fixed-dtoa.h + ../3rdparty/double-conversion/strtod.cc + ../3rdparty/double-conversion/bignum.h + ../3rdparty/double-conversion/bignum.cc + ../3rdparty/double-conversion/cached-powers.cc + ../3rdparty/double-conversion/bignum-dtoa.cc + ../3rdparty/double-conversion/fast-dtoa.h + ../3rdparty/double-conversion/fixed-dtoa.cc + ../3rdparty/double-conversion/string-to-double.cc + ../3rdparty/double-conversion/bignum-dtoa.h ../3rdparty/double-conversion/include/double-conversion/utils.h - ../3rdparty/double-conversion/strtod.cc ../3rdparty/double-conversion/strtod.h + ../3rdparty/double-conversion/include/double-conversion/double-to-string.h + ../3rdparty/double-conversion/include/double-conversion/double-conversion.h + ../3rdparty/double-conversion/include/double-conversion/string-to-double.h INCLUDE_DIRECTORIES - ../3rdparty/double-conversion/.. + ../3rdparty ../3rdparty/double-conversion/include ) |