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 <edward.welbourne@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

22 files changed, 22 insertions, 21 deletions

diff --git a/src/3rdparty/double-conversion/bignum-dtoa.cc b/src/3rdparty/double-conversion/double-conversion/bignum-dtoa.cc
index dfd159dde1..dfd159dde1 100644
--- a/src/3rdparty/double-conversion/bignum-dtoa.cc
+++ b/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
index 34b961992d..34b961992d 100644
--- a/src/3rdparty/double-conversion/bignum-dtoa.h
+++ b/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
index d858c16ca0..d858c16ca0 100644
--- a/src/3rdparty/double-conversion/bignum.cc
+++ b/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
index 14d1ca86fc..14d1ca86fc 100644
--- a/src/3rdparty/double-conversion/bignum.h
+++ b/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
index 56bdfc9d63..56bdfc9d63 100644
--- a/src/3rdparty/double-conversion/cached-powers.cc
+++ b/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
index f38c26d201..f38c26d201 100644
--- a/src/3rdparty/double-conversion/cached-powers.h
+++ b/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
index a2200c4ded..a2200c4ded 100644
--- a/src/3rdparty/double-conversion/diy-fp.h
+++ b/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
index 6e8884d84c..6e8884d84c 100644
--- a/src/3rdparty/double-conversion/double-conversion.h
+++ b/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
index 9255bce171..9255bce171 100644
--- a/src/3rdparty/double-conversion/double-to-string.cc
+++ b/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
index 6317a08a72..6317a08a72 100644
--- a/src/3rdparty/double-conversion/double-to-string.h
+++ b/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
index f470286437..f470286437 100644
--- a/src/3rdparty/double-conversion/fast-dtoa.cc
+++ b/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
index 5f1e8eee5e..5f1e8eee5e 100644
--- a/src/3rdparty/double-conversion/fast-dtoa.h
+++ b/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
index ab6ef10eba..ab6ef10eba 100644
--- a/src/3rdparty/double-conversion/fixed-dtoa.cc
+++ b/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
index 3bdd08e21f..3bdd08e21f 100644
--- a/src/3rdparty/double-conversion/fixed-dtoa.h
+++ b/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
index 3c2a5979ff..3c2a5979ff 100644
--- a/src/3rdparty/double-conversion/ieee.h
+++ b/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
index 03ad670aca..03ad670aca 100644
--- a/src/3rdparty/double-conversion/string-to-double.cc
+++ b/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
index ecd6c76197..ecd6c76197 100644
--- a/src/3rdparty/double-conversion/string-to-double.h
+++ b/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
index 24fd85990e..24fd85990e 100644
--- a/src/3rdparty/double-conversion/strtod.cc
+++ b/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
index ff0ee47092..ff0ee47092 100644
--- a/src/3rdparty/double-conversion/strtod.h
+++ b/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
index c72c333f02..c72c333f02 100644
--- a/src/3rdparty/double-conversion/utils.h
+++ b/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 <double-conversion.h>
+#    include <double-conversion/double-conversion.h>
 #    define QT_CLOCALE_HOLDER
 #  endif // QT_NO_DOUBLECONVERSION
 #endif // QT_BOOTSTRAPPED