cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-15 07:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt: Add patch to fix SFINAE warnings in QAnyStringView with gcc16

Browse Source 
Github-Pull: #34650
Rebased-From: 473e5f8efcdabc584b99f72c364cf15afad1ca97
This commit is contained in:
Hennadii Stepanov 2026-03-06 12:16:02 +00:00
parent 8f5c205aa9
commit fbfc778b68
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
depends/packages/qt.mk
View File

@ -24,6 +24,7 @@ $(package)_patches += fix-gcc16-qcompare.patch
$(package)_patches += fix-gcc16-sfinae-qregularexpression.patch
$(package)_patches += fix-gcc16-sfinae-qchar.patch
$(package)_patches += fix-gcc16-sfinae-qbitarray.patch
$(package)_patches += fix-gcc16-sfinae-qanystringview.patch
$(package)_patches += fix-qbytearray-include.patch
$(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
@ -274,6 +275,7 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qregularexpression.patch && \
patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qchar.patch && \
patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qbitarray.patch && \
patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qanystringview.patch && \
patch -p1 -i $($(package)_patch_dir)/fix-qbytearray-include.patch
endef
ifeq ($(host),$(build))

47
depends/patches/qt/fix-gcc16-sfinae-qanystringview.patch Normal file
View File

@ -0,0 +1,47 @@
commit 27230157212c32420e71b28870d6c77630c3dc37
Author: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri Aug 1 12:14:50 2025 +0200
Fix incomplete SFINAE of QAnyStringView
Inside the QAnyStringView class, the class is incomplete, and will
erroneously fail SFINAE. Do the assert after for it to actually work.
Detected with gcc 16.
Amends 2c9529e158fc589c48e6b1fb61dca2133e33ac4d.
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: Ifd3ad6d3ec17cd1725fb8b735469502791f9e9a3
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
diff --git a/qtbase/src/corelib/text/qanystringview.cpp b/qtbase/src/corelib/text/qanystringview.cpp
index 7bf8a3fa1fd..3c993ff1da0 100644
--- a/qtbase/src/corelib/text/qanystringview.cpp
+++ b/qtbase/src/corelib/text/qanystringview.cpp
@@ -237,6 +237,10 @@ QT_BEGIN_NAMESPACE
\sa isNull(), isEmpty()
*/
+// confirm we don't make an accidental copy constructor:
+static_assert(QtPrivate::IsContainerCompatibleWithQStringView<QAnyStringView>::value == false);
+static_assert(QtPrivate::IsContainerCompatibleWithQUtf8StringView<QAnyStringView>::value == false);
+
/*!
\fn template <typename Char, size_t Size> static QAnyStringView fromArray(const Char (&string)[Size]) noexcept
diff --git a/qtbase/src/corelib/text/qanystringview.h b/qtbase/src/corelib/text/qanystringview.h
index 9617209059b..69b7fafb438 100644
--- a/qtbase/src/corelib/text/qanystringview.h
+++ b/qtbase/src/corelib/text/qanystringview.h
@@ -97,10 +97,6 @@ private:
std::is_convertible<T, QStringOrQByteArray>
>, bool>;
- // confirm we don't make an accidental copy constructor:
- static_assert(QtPrivate::IsContainerCompatibleWithQStringView<QAnyStringView>::value == false);
- static_assert(QtPrivate::IsContainerCompatibleWithQUtf8StringView<QAnyStringView>::value == false);
-
template<typename Char>
static constexpr bool isAsciiOnlyCharsAtCompileTime(Char *str, qsizetype sz) noexcept
{