Merge pull request #13067 from Rmys/master

qt5-declarative rebuild
This commit is contained in:
Rmys
2023-12-09 17:39:30 +03:00
committed by GitHub
2 changed files with 20 additions and 0 deletions
@@ -1,3 +1,16 @@
diff --git a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
index d54b7e9492..b5c5f6a2b0 100644
--- a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
+++ b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
@@ -225,7 +225,7 @@ void OSAllocator::commit(void* address, size_t bytes, bool writable, bool execut
while (madvise(address, bytes, MADV_WILLNEED)) {
if (errno != EAGAIN)
- CRASH();
+ break; // We don't have to crash here. MADV_WILLNEED is only advisory
}
#elif HAVE(MADV_FREE_REUSE)
diff --git a/src/qml/animations/qcontinuinganimationgroupjob.cpp b/src/qml/animations/qcontinuinganimationgroupjob.cpp
index 88c0e9e60e..61a9dc36f8 100644
--- a/src/qml/animations/qcontinuinganimationgroupjob.cpp
@@ -69,6 +69,13 @@
</Package-->
<History>
<Update release="44">
<Date>2023-12-09</Date>
<Version>5.15.11</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="43">
<Date>2023-11-11</Date>
<Version>5.15.11</Version>