Changeset 846 for trunk/src/corelib/thread/qmutex.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/thread/qmutex.cpp (modified) (4 diffs)

trunk/src/corelib/thread/qmutex.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -42 +42 @@
 #include "qplatformdefs.h"
 #include "qmutex.h"
+
 
 #ifndef QT_NO_THREAD
@@ -160 +161 @@
 #ifndef QT_NO_DEBUG
             if (d->owner == self)
-                qWarning("QMutex::lock: Deadlock detected in thread %ld",
-                         long(d->owner));
+                qWarning() << "QMutex::lock: Deadlock detected in thread" << d->owner;
 #endif
 
@@ -198 +198 @@
 #ifndef QT_NO_DEBUG
                     if (d->owner == self)
-                        qWarning("QMutex::lock: Deadlock detected in thread %ld",
-                                 long(d->owner));
+                        qWarning() << "QMutex::lock: Deadlock detected in thread" << d->owner;
 #endif