Qt 5.6 patch for QMutex problem
Gleb Popov
6yearold at gmail.com
Mon Aug 15 10:38:00 UTC 2016
This is the patch against 5.6 branch that fixes the QMutex problem:
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index fa3bb08..db8e33e 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -571,7 +571,7 @@ const int
FreeListConstants::Sizes[FreeListConstants::BlockCount] = {
typedef QFreeList<QMutexPrivate, FreeListConstants> FreeList;
// We cannot use Q_GLOBAL_STATIC because it uses QMutex
-#if defined(Q_COMPILER_THREADSAFE_STATICS)
+#if defined(Q_COMPILER_THREADSAFE_STATICS) && !defined(Q_OS_FREEBSD)
FreeList *freelist()
{
static FreeList list;
There was another proposed patch (which also worked fine), which involved
moving
static FreeList list;
line out of the freelist() function to the global scope.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-freebsd/attachments/20160815/c8f43dc0/attachment-0001.html>
More information about the kde-freebsd
mailing list