1 files changed, 9 insertions, 4 deletions

diff --git a/qmake/tools/qwaitcondition_unix.cpp b/qmake/tools/qwaitcondition_unix.cpp
index 99c1014..6684617 100644
--- a/qmake/tools/qwaitcondition_unix.cpp
+++ b/qmake/tools/qwaitcondition_unix.cpp
@@ -124,7 +124,7 @@ struct QWaitConditionPrivate {
         getchar();
         mymutex.lock();
         // Sleep until there are no busy worker threads
-        while( count > 0 ) {
+        while( mycount > 0 ) {
             mymutex.unlock();
             sleep( 1 );
             mymutex.lock();
@@ -224,7 +224,9 @@ void QWaitCondition::wakeAll()
 */
 bool QWaitCondition::wait(unsigned long time)
 {
-    pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+    pthread_mutex_t mutex;
+    pthread_mutex_init( &mutex, 0 );
+    pthread_mutex_lock( &mutex );
 
     int ret;
     if (time != ULONG_MAX) {
@@ -232,7 +234,7 @@ bool QWaitCondition::wait(unsigned long time)
         gettimeofday(&tv, 0);
 
         timespec ti;
-        ti.tv_nsec = (tv.tv_usec * 1000) + (time % 1000) * 1000;
+        ti.tv_nsec = ( tv.tv_usec + ( time % 1000 ) * 1000 ) * 1000;
         ti.tv_sec = tv.tv_sec + (time / 1000) + ( ti.tv_nsec / 1000000000 );
         ti.tv_nsec %= 1000000000;
 
@@ -245,6 +247,9 @@ bool QWaitCondition::wait(unsigned long time)
         qWarning("Wait condition wait failure: %s",strerror(ret));
 #endif
 
+    pthread_mutex_unlock( &mutex );
+    pthread_mutex_destroy( &mutex );
+
     return (ret == 0);
 }
 
@@ -291,7 +296,7 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time)
         gettimeofday(&tv, 0);
 
         timespec ti;
-        ti.tv_nsec = (tv.tv_usec * 1000) + (time % 1000) * 1000;
+        ti.tv_nsec = ( tv.tv_usec + ( time % 1000 ) * 1000 ) * 1000;
         ti.tv_sec = tv.tv_sec + (time / 1000) + ( ti.tv_nsec / 1000000000 );
         ti.tv_nsec %= 1000000000;