From dca74b45a33de3ec098b936b087a112c7112241b Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 26 Jan 2021 13:01:26 +0100 Subject: [PATCH] Use the double-conversion sources without rearrangement This simplifies the include path addition we need when compiling and eliminates the need to rewrite all the #include lines on update. Change-Id: I14e301d277f1eb49286721b012559f0ec84ea520 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- src/3rdparty/double-conversion/bignum-dtoa.cc | 6 +- src/3rdparty/double-conversion/bignum-dtoa.h | 2 +- src/3rdparty/double-conversion/bignum.cc | 4 +- src/3rdparty/double-conversion/bignum.h | 2 +- .../double-conversion/cached-powers.cc | 4 +- .../double-conversion/cached-powers.h | 2 +- src/3rdparty/double-conversion/diy-fp.h | 2 +- .../double-conversion.h | 4 +- .../double-conversion/double-to-string.cc | 12 +- .../double-conversion => }/double-to-string.h | 2 +- src/3rdparty/double-conversion/fast-dtoa.cc | 8 +- src/3rdparty/double-conversion/fast-dtoa.h | 2 +- src/3rdparty/double-conversion/fixed-dtoa.cc | 4 +- src/3rdparty/double-conversion/fixed-dtoa.h | 2 +- src/3rdparty/double-conversion/ieee.h | 2 +- ...9999-Convert-include-to-fit-Qt-usage.patch | 322 ------------------ .../double-conversion/string-to-double.cc | 8 +- .../double-conversion => }/string-to-double.h | 2 +- src/3rdparty/double-conversion/strtod.cc | 8 +- src/3rdparty/double-conversion/strtod.h | 2 +- .../{include/double-conversion => }/utils.h | 0 src/corelib/CMakeLists.txt | 33 +- src/corelib/text/qdoublescanprint_p.h | 2 +- 23 files changed, 56 insertions(+), 379 deletions(-) rename src/3rdparty/double-conversion/{include/double-conversion => }/double-conversion.h (94%) rename src/3rdparty/double-conversion/{include/double-conversion => }/double-to-string.h (99%) delete mode 100644 src/3rdparty/double-conversion/patches/9999-Convert-include-to-fit-Qt-usage.patch rename src/3rdparty/double-conversion/{include/double-conversion => }/string-to-double.h (99%) rename src/3rdparty/double-conversion/{include/double-conversion => }/utils.h (100%) diff --git a/src/3rdparty/double-conversion/bignum-dtoa.cc b/src/3rdparty/double-conversion/bignum-dtoa.cc index 293560aa53..dfd159dde1 100644 --- a/src/3rdparty/double-conversion/bignum-dtoa.cc +++ b/src/3rdparty/double-conversion/bignum-dtoa.cc @@ -27,10 +27,10 @@ #include -#include +#include "bignum-dtoa.h" -#include -#include +#include "bignum.h" +#include "ieee.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/bignum-dtoa.h b/src/3rdparty/double-conversion/bignum-dtoa.h index 9d15ce3dce..34b961992d 100644 --- a/src/3rdparty/double-conversion/bignum-dtoa.h +++ b/src/3rdparty/double-conversion/bignum-dtoa.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_ #define DOUBLE_CONVERSION_BIGNUM_DTOA_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/bignum.cc index a76ac50940..d858c16ca0 100644 --- a/src/3rdparty/double-conversion/bignum.cc +++ b/src/3rdparty/double-conversion/bignum.cc @@ -28,8 +28,8 @@ #include #include -#include -#include +#include "bignum.h" +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/bignum.h index da71d91153..14d1ca86fc 100644 --- a/src/3rdparty/double-conversion/bignum.h +++ b/src/3rdparty/double-conversion/bignum.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_BIGNUM_H_ #define DOUBLE_CONVERSION_BIGNUM_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/cached-powers.cc index 48933f6a4f..56bdfc9d63 100644 --- a/src/3rdparty/double-conversion/cached-powers.cc +++ b/src/3rdparty/double-conversion/cached-powers.cc @@ -29,9 +29,9 @@ #include #include -#include +#include "utils.h" -#include +#include "cached-powers.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/cached-powers.h b/src/3rdparty/double-conversion/cached-powers.h index fd223ecafe..f38c26d201 100644 --- a/src/3rdparty/double-conversion/cached-powers.h +++ b/src/3rdparty/double-conversion/cached-powers.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_ #define DOUBLE_CONVERSION_CACHED_POWERS_H_ -#include +#include "diy-fp.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/diy-fp.h index 264d45633c..a2200c4ded 100644 --- a/src/3rdparty/double-conversion/diy-fp.h +++ b/src/3rdparty/double-conversion/diy-fp.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DIY_FP_H_ #define DOUBLE_CONVERSION_DIY_FP_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/include/double-conversion/double-conversion.h b/src/3rdparty/double-conversion/double-conversion.h similarity index 94% rename from src/3rdparty/double-conversion/include/double-conversion/double-conversion.h rename to src/3rdparty/double-conversion/double-conversion.h index 9f74eb8bfd..6e8884d84c 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/double-conversion.h +++ b/src/3rdparty/double-conversion/double-conversion.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ #define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ -#include -#include +#include "string-to-double.h" +#include "double-to-string.h" #endif // DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ diff --git a/src/3rdparty/double-conversion/double-to-string.cc b/src/3rdparty/double-conversion/double-to-string.cc index 9ae2ea2f91..9255bce171 100644 --- a/src/3rdparty/double-conversion/double-to-string.cc +++ b/src/3rdparty/double-conversion/double-to-string.cc @@ -29,13 +29,13 @@ #include #include -#include +#include "double-to-string.h" -#include -#include -#include -#include -#include +#include "bignum-dtoa.h" +#include "fast-dtoa.h" +#include "fixed-dtoa.h" +#include "ieee.h" +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/include/double-conversion/double-to-string.h b/src/3rdparty/double-conversion/double-to-string.h similarity index 99% rename from src/3rdparty/double-conversion/include/double-conversion/double-to-string.h rename to src/3rdparty/double-conversion/double-to-string.h index 1a750c85d0..6317a08a72 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/double-to-string.h +++ b/src/3rdparty/double-conversion/double-to-string.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ #define DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/fast-dtoa.cc b/src/3rdparty/double-conversion/fast-dtoa.cc index a169efd797..f470286437 100644 --- a/src/3rdparty/double-conversion/fast-dtoa.cc +++ b/src/3rdparty/double-conversion/fast-dtoa.cc @@ -25,11 +25,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include +#include "fast-dtoa.h" -#include -#include -#include +#include "cached-powers.h" +#include "diy-fp.h" +#include "ieee.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/fast-dtoa.h b/src/3rdparty/double-conversion/fast-dtoa.h index ac4317c04d..5f1e8eee5e 100644 --- a/src/3rdparty/double-conversion/fast-dtoa.h +++ b/src/3rdparty/double-conversion/fast-dtoa.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_FAST_DTOA_H_ #define DOUBLE_CONVERSION_FAST_DTOA_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/fixed-dtoa.cc index 3e04a6325c..ab6ef10eba 100644 --- a/src/3rdparty/double-conversion/fixed-dtoa.cc +++ b/src/3rdparty/double-conversion/fixed-dtoa.cc @@ -27,8 +27,8 @@ #include -#include -#include +#include "fixed-dtoa.h" +#include "ieee.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/fixed-dtoa.h b/src/3rdparty/double-conversion/fixed-dtoa.h index a9436fc9f6..3bdd08e21f 100644 --- a/src/3rdparty/double-conversion/fixed-dtoa.h +++ b/src/3rdparty/double-conversion/fixed-dtoa.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_FIXED_DTOA_H_ #define DOUBLE_CONVERSION_FIXED_DTOA_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h index dce16a1ad8..3c2a5979ff 100644 --- a/src/3rdparty/double-conversion/ieee.h +++ b/src/3rdparty/double-conversion/ieee.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_H_ #define DOUBLE_CONVERSION_DOUBLE_H_ -#include +#include "diy-fp.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/patches/9999-Convert-include-to-fit-Qt-usage.patch b/src/3rdparty/double-conversion/patches/9999-Convert-include-to-fit-Qt-usage.patch deleted file mode 100644 index 8e01b2e2dc..0000000000 --- a/src/3rdparty/double-conversion/patches/9999-Convert-include-to-fit-Qt-usage.patch +++ /dev/null @@ -1,322 +0,0 @@ -From 1122b195026c9fbd4dd1b188cda9770bdd2ca908 Mon Sep 17 00:00:00 2001 -From: Edward Welbourne -Date: Wed, 20 Jan 2021 18:09:19 +0100 -Subject: [PATCH 5/5] Convert #include to fit Qt usage - -Use rather than "header.h" ---- - double-conversion/bignum-dtoa.cc | 6 +++--- - double-conversion/bignum-dtoa.h | 2 +- - double-conversion/bignum.cc | 4 ++-- - double-conversion/bignum.h | 2 +- - double-conversion/cached-powers.cc | 4 ++-- - double-conversion/cached-powers.h | 2 +- - double-conversion/diy-fp.h | 2 +- - double-conversion/double-conversion.h | 4 ++-- - double-conversion/double-to-string.cc | 12 ++++++------ - double-conversion/double-to-string.h | 2 +- - double-conversion/fast-dtoa.cc | 8 ++++---- - double-conversion/fast-dtoa.h | 2 +- - double-conversion/fixed-dtoa.cc | 4 ++-- - double-conversion/fixed-dtoa.h | 2 +- - double-conversion/ieee.h | 2 +- - double-conversion/string-to-double.cc | 8 ++++---- - double-conversion/string-to-double.h | 2 +- - double-conversion/strtod.cc | 8 ++++---- - double-conversion/strtod.h | 2 +- - 19 files changed, 39 insertions(+), 39 deletions(-) - -diff --git a/double-conversion/bignum-dtoa.cc b/double-conversion/bignum-dtoa.cc -index dfd159d..293560a 100644 ---- a/double-conversion/bignum-dtoa.cc -+++ b/double-conversion/bignum-dtoa.cc -@@ -27,10 +27,10 @@ - - #include - --#include "bignum-dtoa.h" -+#include - --#include "bignum.h" --#include "ieee.h" -+#include -+#include - - namespace double_conversion { - -diff --git a/double-conversion/bignum-dtoa.h b/double-conversion/bignum-dtoa.h -index 34b9619..9d15ce3 100644 ---- a/double-conversion/bignum-dtoa.h -+++ b/double-conversion/bignum-dtoa.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_ - #define DOUBLE_CONVERSION_BIGNUM_DTOA_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/bignum.cc b/double-conversion/bignum.cc -index d858c16..a76ac50 100644 ---- a/double-conversion/bignum.cc -+++ b/double-conversion/bignum.cc -@@ -28,8 +28,8 @@ - #include - #include - --#include "bignum.h" --#include "utils.h" -+#include -+#include - - namespace double_conversion { - -diff --git a/double-conversion/bignum.h b/double-conversion/bignum.h -index 14d1ca8..da71d91 100644 ---- a/double-conversion/bignum.h -+++ b/double-conversion/bignum.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_BIGNUM_H_ - #define DOUBLE_CONVERSION_BIGNUM_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/cached-powers.cc b/double-conversion/cached-powers.cc -index 56bdfc9..48933f6 100644 ---- a/double-conversion/cached-powers.cc -+++ b/double-conversion/cached-powers.cc -@@ -29,9 +29,9 @@ - #include - #include - --#include "utils.h" -+#include - --#include "cached-powers.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/cached-powers.h b/double-conversion/cached-powers.h -index f38c26d..fd223ec 100644 ---- a/double-conversion/cached-powers.h -+++ b/double-conversion/cached-powers.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_ - #define DOUBLE_CONVERSION_CACHED_POWERS_H_ - --#include "diy-fp.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/diy-fp.h b/double-conversion/diy-fp.h -index a2200c4..264d456 100644 ---- a/double-conversion/diy-fp.h -+++ b/double-conversion/diy-fp.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_DIY_FP_H_ - #define DOUBLE_CONVERSION_DIY_FP_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/double-conversion.h b/double-conversion/double-conversion.h -index 6e8884d..9f74eb8 100644 ---- a/double-conversion/double-conversion.h -+++ b/double-conversion/double-conversion.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ - #define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ - --#include "string-to-double.h" --#include "double-to-string.h" -+#include -+#include - - #endif // DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ -diff --git a/double-conversion/double-to-string.cc b/double-conversion/double-to-string.cc -index 4562f99..63c6c58 100644 ---- a/double-conversion/double-to-string.cc -+++ b/double-conversion/double-to-string.cc -@@ -29,13 +29,13 @@ - #include - #include - --#include "double-to-string.h" -+#include - --#include "bignum-dtoa.h" --#include "fast-dtoa.h" --#include "fixed-dtoa.h" --#include "ieee.h" --#include "utils.h" -+#include -+#include -+#include -+#include -+#include - - namespace double_conversion { - -diff --git a/double-conversion/double-to-string.h b/double-conversion/double-to-string.h -index a44fa3c..d8ad606 100644 ---- a/double-conversion/double-to-string.h -+++ b/double-conversion/double-to-string.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ - #define DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/fast-dtoa.cc b/double-conversion/fast-dtoa.cc -index f470286..a169efd 100644 ---- a/double-conversion/fast-dtoa.cc -+++ b/double-conversion/fast-dtoa.cc -@@ -25,11 +25,11 @@ - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --#include "fast-dtoa.h" -+#include - --#include "cached-powers.h" --#include "diy-fp.h" --#include "ieee.h" -+#include -+#include -+#include - - namespace double_conversion { - -diff --git a/double-conversion/fast-dtoa.h b/double-conversion/fast-dtoa.h -index 5f1e8ee..ac4317c 100644 ---- a/double-conversion/fast-dtoa.h -+++ b/double-conversion/fast-dtoa.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_FAST_DTOA_H_ - #define DOUBLE_CONVERSION_FAST_DTOA_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/fixed-dtoa.cc b/double-conversion/fixed-dtoa.cc -index ab6ef10..3e04a63 100644 ---- a/double-conversion/fixed-dtoa.cc -+++ b/double-conversion/fixed-dtoa.cc -@@ -27,8 +27,8 @@ - - #include - --#include "fixed-dtoa.h" --#include "ieee.h" -+#include -+#include - - namespace double_conversion { - -diff --git a/double-conversion/fixed-dtoa.h b/double-conversion/fixed-dtoa.h -index 3bdd08e..a9436fc 100644 ---- a/double-conversion/fixed-dtoa.h -+++ b/double-conversion/fixed-dtoa.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_FIXED_DTOA_H_ - #define DOUBLE_CONVERSION_FIXED_DTOA_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/ieee.h b/double-conversion/ieee.h -index 3c2a597..dce16a1 100644 ---- a/double-conversion/ieee.h -+++ b/double-conversion/ieee.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_DOUBLE_H_ - #define DOUBLE_CONVERSION_DOUBLE_H_ - --#include "diy-fp.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/string-to-double.cc b/double-conversion/string-to-double.cc -index e3cabbb..2c41b84 100644 ---- a/double-conversion/string-to-double.cc -+++ b/double-conversion/string-to-double.cc -@@ -29,11 +29,11 @@ - #include - #include - --#include "string-to-double.h" -+#include - --#include "ieee.h" --#include "strtod.h" --#include "utils.h" -+#include -+#include -+#include - - // Fix warning C4244: 'argument': conversion from 'const uc16' to 'char', possible loss of data - #ifdef _MSC_VER -diff --git a/double-conversion/string-to-double.h b/double-conversion/string-to-double.h -index ecd6c76..30d9e34 100644 ---- a/double-conversion/string-to-double.h -+++ b/double-conversion/string-to-double.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ - #define DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - -diff --git a/double-conversion/strtod.cc b/double-conversion/strtod.cc -index 7b9657b..79ea8e8 100644 ---- a/double-conversion/strtod.cc -+++ b/double-conversion/strtod.cc -@@ -28,10 +28,10 @@ - #include - #include - --#include "bignum.h" --#include "cached-powers.h" --#include "ieee.h" --#include "strtod.h" -+#include -+#include -+#include -+#include - - namespace double_conversion { - -diff --git a/double-conversion/strtod.h b/double-conversion/strtod.h -index ff0ee47..3e88e6e 100644 ---- a/double-conversion/strtod.h -+++ b/double-conversion/strtod.h -@@ -28,7 +28,7 @@ - #ifndef DOUBLE_CONVERSION_STRTOD_H_ - #define DOUBLE_CONVERSION_STRTOD_H_ - --#include "utils.h" -+#include - - namespace double_conversion { - --- -2.29.2 - diff --git a/src/3rdparty/double-conversion/string-to-double.cc b/src/3rdparty/double-conversion/string-to-double.cc index 5cb563a656..03ad670aca 100644 --- a/src/3rdparty/double-conversion/string-to-double.cc +++ b/src/3rdparty/double-conversion/string-to-double.cc @@ -29,11 +29,11 @@ #include #include -#include +#include "string-to-double.h" -#include -#include -#include +#include "ieee.h" +#include "strtod.h" +#include "utils.h" #ifdef _MSC_VER # if _MSC_VER >= 1900 diff --git a/src/3rdparty/double-conversion/include/double-conversion/string-to-double.h b/src/3rdparty/double-conversion/string-to-double.h similarity index 99% rename from src/3rdparty/double-conversion/include/double-conversion/string-to-double.h rename to src/3rdparty/double-conversion/string-to-double.h index 30d9e3412b..ecd6c76197 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/string-to-double.h +++ b/src/3rdparty/double-conversion/string-to-double.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ #define DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/strtod.cc index b3236acbd5..24fd85990e 100644 --- a/src/3rdparty/double-conversion/strtod.cc +++ b/src/3rdparty/double-conversion/strtod.cc @@ -28,10 +28,10 @@ #include #include -#include -#include -#include -#include +#include "bignum.h" +#include "cached-powers.h" +#include "ieee.h" +#include "strtod.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/strtod.h b/src/3rdparty/double-conversion/strtod.h index 3e88e6ea8a..ff0ee47092 100644 --- a/src/3rdparty/double-conversion/strtod.h +++ b/src/3rdparty/double-conversion/strtod.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_STRTOD_H_ #define DOUBLE_CONVERSION_STRTOD_H_ -#include +#include "utils.h" namespace double_conversion { diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/utils.h similarity index 100% rename from src/3rdparty/double-conversion/include/double-conversion/utils.h rename to src/3rdparty/double-conversion/utils.h diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 97aaff3cfe..18eb2451cf 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -747,29 +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/cached-powers.h - ../3rdparty/double-conversion/double-to-string.cc - ../3rdparty/double-conversion/ieee.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/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/bignum-dtoa.h - ../3rdparty/double-conversion/include/double-conversion/utils.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 + ../3rdparty/double-conversion/string-to-double.h + ../3rdparty/double-conversion/strtod.cc + ../3rdparty/double-conversion/strtod.h + ../3rdparty/double-conversion/utils.h INCLUDE_DIRECTORIES - ../3rdparty - ../3rdparty/double-conversion/include + ../3rdparty/double-conversion ) qt_internal_extend_target(Core CONDITION QT_FEATURE_system_libb2 diff --git a/src/corelib/text/qdoublescanprint_p.h b/src/corelib/text/qdoublescanprint_p.h index 3865c69a99..342465e452 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