diff -r b72c6db6890b -r 5dc02b23752f src/corelib/thread/qreadwritelock.cpp --- a/src/corelib/thread/qreadwritelock.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/corelib/thread/qreadwritelock.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -252,7 +252,7 @@ while (d->accessCount < 0 || d->waitingWriters) { ++d->waitingReaders; - bool success = d->readerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : timeout); + bool success = d->readerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : ulong(timeout)); --d->waitingReaders; if (!success) return false; @@ -374,7 +374,7 @@ while (d->accessCount != 0) { ++d->waitingWriters; - bool success = d->writerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : timeout); + bool success = d->writerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : ulong(timeout)); --d->waitingWriters; if (!success)