Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp
index 3cb57dd..5b2a9a9 100644
--- a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp
@@ -943,10 +943,10 @@ void tst_QReadWriteLock::uncontendedLocks()
         }
     }
 
-    printf("during %d millisecs:\n", millisecs);
-    printf("counted to %u\n", count);
-    printf("%u uncontended read locks/unlocks\n", read);
-    printf("%u uncontended write locks/unlocks\n", write);
+    qDebug("during %d millisecs:", millisecs);
+    qDebug("counted to %u", count);
+    qDebug("%u uncontended read locks/unlocks", read);
+    qDebug("%u uncontended write locks/unlocks", write);
 }
 
 enum { RecursiveLockCount = 10 };