From 5bd16f132dcc4d16d7ba7e91ffba92ff005b91e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 8 Feb 2021 17:23:18 +0100 Subject: [PATCH] Fix compilation with system double-conversion A recent patch made it so we don't need to keep patching the includes of the sources. However it changed how we use double-conversion ourselves which meant that system installs would no longer work. Keeping an extra directory and adding another INCLUDE_DIRECTORY fixes both of our problems. Amends dca74b45a33de3ec098b936b087a112c7112241b Fixes: QTBUG-90961 Change-Id: If17aa1670535867343374eec846055441592f36b Reviewed-by: Edward Welbourne Reviewed-by: Joerg Bornemann --- .../{ => double-conversion}/bignum-dtoa.cc | 0 .../{ => double-conversion}/bignum-dtoa.h | 0 .../{ => double-conversion}/bignum.cc | 0 .../{ => double-conversion}/bignum.h | 0 .../{ => double-conversion}/cached-powers.cc | 0 .../{ => double-conversion}/cached-powers.h | 0 .../{ => double-conversion}/diy-fp.h | 0 .../double-conversion.h | 0 .../double-to-string.cc | 0 .../double-to-string.h | 0 .../{ => double-conversion}/fast-dtoa.cc | 0 .../{ => double-conversion}/fast-dtoa.h | 0 .../{ => double-conversion}/fixed-dtoa.cc | 0 .../{ => double-conversion}/fixed-dtoa.h | 0 .../{ => double-conversion}/ieee.h | 0 .../string-to-double.cc | 0 .../string-to-double.h | 0 .../{ => double-conversion}/strtod.cc | 0 .../{ => double-conversion}/strtod.h | 0 .../{ => double-conversion}/utils.h | 0 src/corelib/CMakeLists.txt | 41 ++++++++++--------- src/corelib/text/qdoublescanprint_p.h | 2 +- 22 files changed, 22 insertions(+), 21 deletions(-) rename src/3rdparty/double-conversion/{ => double-conversion}/bignum-dtoa.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/bignum-dtoa.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/bignum.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/bignum.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/cached-powers.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/cached-powers.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/diy-fp.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/double-conversion.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/double-to-string.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/double-to-string.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/fast-dtoa.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/fast-dtoa.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/fixed-dtoa.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/fixed-dtoa.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/ieee.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/string-to-double.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/string-to-double.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/strtod.cc (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/strtod.h (100%) rename src/3rdparty/double-conversion/{ => double-conversion}/utils.h (100%) diff --git a/src/3rdparty/double-conversion/bignum-dtoa.cc b/src/3rdparty/double-conversion/double-conversion/bignum-dtoa.cc similarity index 100% rename from src/3rdparty/double-conversion/bignum-dtoa.cc rename to src/3rdparty/double-conversion/double-conversion/bignum-dtoa.cc diff --git a/src/3rdparty/double-conversion/bignum-dtoa.h b/src/3rdparty/double-conversion/double-conversion/bignum-dtoa.h similarity index 100% rename from src/3rdparty/double-conversion/bignum-dtoa.h rename to src/3rdparty/double-conversion/double-conversion/bignum-dtoa.h diff --git a/src/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/double-conversion/bignum.cc similarity index 100% rename from src/3rdparty/double-conversion/bignum.cc rename to src/3rdparty/double-conversion/double-conversion/bignum.cc diff --git a/src/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/double-conversion/bignum.h similarity index 100% rename from src/3rdparty/double-conversion/bignum.h rename to src/3rdparty/double-conversion/double-conversion/bignum.h diff --git a/src/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/double-conversion/cached-powers.cc similarity index 100% rename from src/3rdparty/double-conversion/cached-powers.cc rename to src/3rdparty/double-conversion/double-conversion/cached-powers.cc diff --git a/src/3rdparty/double-conversion/cached-powers.h b/src/3rdparty/double-conversion/double-conversion/cached-powers.h similarity index 100% rename from src/3rdparty/double-conversion/cached-powers.h rename to src/3rdparty/double-conversion/double-conversion/cached-powers.h diff --git a/src/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/double-conversion/diy-fp.h similarity index 100% rename from src/3rdparty/double-conversion/diy-fp.h rename to src/3rdparty/double-conversion/double-conversion/diy-fp.h diff --git a/src/3rdparty/double-conversion/double-conversion.h b/src/3rdparty/double-conversion/double-conversion/double-conversion.h similarity index 100% rename from src/3rdparty/double-conversion/double-conversion.h rename to src/3rdparty/double-conversion/double-conversion/double-conversion.h diff --git a/src/3rdparty/double-conversion/double-to-string.cc b/src/3rdparty/double-conversion/double-conversion/double-to-string.cc similarity index 100% rename from src/3rdparty/double-conversion/double-to-string.cc rename to src/3rdparty/double-conversion/double-conversion/double-to-string.cc diff --git a/src/3rdparty/double-conversion/double-to-string.h b/src/3rdparty/double-conversion/double-conversion/double-to-string.h similarity index 100% rename from src/3rdparty/double-conversion/double-to-string.h rename to src/3rdparty/double-conversion/double-conversion/double-to-string.h diff --git a/src/3rdparty/double-conversion/fast-dtoa.cc b/src/3rdparty/double-conversion/double-conversion/fast-dtoa.cc similarity index 100% rename from src/3rdparty/double-conversion/fast-dtoa.cc rename to src/3rdparty/double-conversion/double-conversion/fast-dtoa.cc diff --git a/src/3rdparty/double-conversion/fast-dtoa.h b/src/3rdparty/double-conversion/double-conversion/fast-dtoa.h similarity index 100% rename from src/3rdparty/double-conversion/fast-dtoa.h rename to src/3rdparty/double-conversion/double-conversion/fast-dtoa.h diff --git a/src/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/double-conversion/fixed-dtoa.cc similarity index 100% rename from src/3rdparty/double-conversion/fixed-dtoa.cc rename to src/3rdparty/double-conversion/double-conversion/fixed-dtoa.cc diff --git a/src/3rdparty/double-conversion/fixed-dtoa.h b/src/3rdparty/double-conversion/double-conversion/fixed-dtoa.h similarity index 100% rename from src/3rdparty/double-conversion/fixed-dtoa.h rename to src/3rdparty/double-conversion/double-conversion/fixed-dtoa.h diff --git a/src/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/double-conversion/ieee.h similarity index 100% rename from src/3rdparty/double-conversion/ieee.h rename to src/3rdparty/double-conversion/double-conversion/ieee.h diff --git a/src/3rdparty/double-conversion/string-to-double.cc b/src/3rdparty/double-conversion/double-conversion/string-to-double.cc similarity index 100% rename from src/3rdparty/double-conversion/string-to-double.cc rename to src/3rdparty/double-conversion/double-conversion/string-to-double.cc diff --git a/src/3rdparty/double-conversion/string-to-double.h b/src/3rdparty/double-conversion/double-conversion/string-to-double.h similarity index 100% rename from src/3rdparty/double-conversion/string-to-double.h rename to src/3rdparty/double-conversion/double-conversion/string-to-double.h diff --git a/src/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/double-conversion/strtod.cc similarity index 100% rename from src/3rdparty/double-conversion/strtod.cc rename to src/3rdparty/double-conversion/double-conversion/strtod.cc diff --git a/src/3rdparty/double-conversion/strtod.h b/src/3rdparty/double-conversion/double-conversion/strtod.h similarity index 100% rename from src/3rdparty/double-conversion/strtod.h rename to src/3rdparty/double-conversion/double-conversion/strtod.h diff --git a/src/3rdparty/double-conversion/utils.h b/src/3rdparty/double-conversion/double-conversion/utils.h similarity index 100% rename from src/3rdparty/double-conversion/utils.h rename to src/3rdparty/double-conversion/double-conversion/utils.h diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 18eb2451cf..ecf8318064 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -747,27 +747,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-dtoa.cc - ../3rdparty/double-conversion/bignum-dtoa.h - ../3rdparty/double-conversion/bignum.h - ../3rdparty/double-conversion/cached-powers.cc - ../3rdparty/double-conversion/cached-powers.h - ../3rdparty/double-conversion/diy-fp.h - ../3rdparty/double-conversion/double-conversion.h - ../3rdparty/double-conversion/double-to-string.cc - ../3rdparty/double-conversion/double-to-string.h - ../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/ieee.h - ../3rdparty/double-conversion/string-to-double.cc - ../3rdparty/double-conversion/string-to-double.h - ../3rdparty/double-conversion/strtod.cc - ../3rdparty/double-conversion/strtod.h - ../3rdparty/double-conversion/utils.h + ../3rdparty/double-conversion/double-conversion/bignum.cc + ../3rdparty/double-conversion/double-conversion/bignum-dtoa.cc + ../3rdparty/double-conversion/double-conversion/bignum-dtoa.h + ../3rdparty/double-conversion/double-conversion/bignum.h + ../3rdparty/double-conversion/double-conversion/cached-powers.cc + ../3rdparty/double-conversion/double-conversion/cached-powers.h + ../3rdparty/double-conversion/double-conversion/diy-fp.h + ../3rdparty/double-conversion/double-conversion/double-conversion.h + ../3rdparty/double-conversion/double-conversion/double-to-string.cc + ../3rdparty/double-conversion/double-conversion/double-to-string.h + ../3rdparty/double-conversion/double-conversion/fast-dtoa.cc + ../3rdparty/double-conversion/double-conversion/fast-dtoa.h + ../3rdparty/double-conversion/double-conversion/fixed-dtoa.cc + ../3rdparty/double-conversion/double-conversion/fixed-dtoa.h + ../3rdparty/double-conversion/double-conversion/ieee.h + ../3rdparty/double-conversion/double-conversion/string-to-double.cc + ../3rdparty/double-conversion/double-conversion/string-to-double.h + ../3rdparty/double-conversion/double-conversion/strtod.cc + ../3rdparty/double-conversion/double-conversion/strtod.h + ../3rdparty/double-conversion/double-conversion/utils.h INCLUDE_DIRECTORIES + ../3rdparty/double-conversion/double-conversion ../3rdparty/double-conversion ) diff --git a/src/corelib/text/qdoublescanprint_p.h b/src/corelib/text/qdoublescanprint_p.h index 342465e452..3865c69a99 100644 --- a/src/corelib/text/qdoublescanprint_p.h +++ b/src/corelib/text/qdoublescanprint_p.h @@ -148,7 +148,7 @@ inline int qDoubleSnprintf(char *buf, size_t buflen, locale_t locale, const char QT_END_NAMESPACE # else // !QT_NO_DOUBLECONVERSION -# include +# include # define QT_CLOCALE_HOLDER # endif // QT_NO_DOUBLECONVERSION #endif // QT_BOOTSTRAPPED