921cb6c860
* Fix patch applicability * Combine patches for missing qt3 headers and remove krell variant The variant should have always been applied. * Restrict QT patches to actual applicable versions/situations - I researched the associated patches so now their `when=` should more closely match when they're actually needed. - I sorted the patch order so they're grouped by version requirement - I renamed the patches so they're listed by version requirements
12 lines
782 B
Diff
12 lines
782 B
Diff
--- a/qtbase/src/corelib/global/qnumeric_p.h 2018-11-25 06:51:11.000000000 -0600
|
|
+++ b/qtbase/src/corelib/global/qnumeric_p.h 2020-01-07 14:13:12.103818264 -0600
|
|
@@ -168,7 +168,7 @@
|
|
// size_t. Implementations for 8- and 16-bit types will work but may not be as
|
|
// efficient. Implementations for 64-bit may be missing on 32-bit platforms.
|
|
|
|
-#if (defined(Q_CC_GNU) && (Q_CC_GNU >= 500) || (defined(Q_CC_INTEL) && !defined(Q_OS_WIN))) || QT_HAS_BUILTIN(__builtin_add_overflowx)
|
|
+#if (defined(Q_CC_GNU) && (Q_CC_GNU >= 500) && !defined(Q_CC_INTEL) || (defined(Q_CC_INTEL) && (Q_CC_INTEL >= 1800) && (Q_CC_GNU >= 500) && !defined(Q_OS_WIN))) || QT_HAS_BUILTIN(__builtin_add_overflowx)
|
|
// GCC 5, ICC 18, and Clang 3.8 have builtins to detect overflows
|
|
|
|
template <typename T> inline
|