From 9ea7824ff93b9b4d689f972f7bbead75b77906ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 7 Sep 2014 00:45:18 +0200 Subject: [PATCH] Fix FTBFS because invalid data conversion in qmutex (cherry picked from commit a28cbf4837fbb1094ff790bf53cbec2dcab94a60) --- src/tools/qmutex_unix.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp index 7f14e6a..c392d29 100644 --- a/src/tools/qmutex_unix.cpp +++ b/src/tools/qmutex_unix.cpp @@ -72,6 +72,7 @@ typedef pthread_mutex_t Q_MUTEX_T; #include "qmutex_p.h" #include +#include #include @@ -264,8 +265,8 @@ void QRecursiveMutexPrivate::unlock() } else { #ifdef QT_CHECK_RANGE qWarning("QMutex::unlock: unlock from different thread than locker"); - qWarning(" was locked by %d, unlock attempt from %d", - (int)owner, (int)pthread_self()); + qWarning(" was locked by %d, unlock attempt from %lu", + (int)owner, (uintptr_t)pthread_self()); #endif }