1 files changed, 6 insertions, 9 deletions

diff --git a/qmake/tools/qcomlibrary.cpp b/qmake/tools/qcomlibrary.cpp
index a7162fc..2a1b75a 100644
--- a/qmake/tools/qcomlibrary.cpp
+++ b/qmake/tools/qcomlibrary.cpp
@@ -65,2 +65,6 @@ QComLibrary::~QComLibrary()
         unload();
+    if ( libiface )
+        libiface->release();
+    if ( entry )
+        entry->release();
 }
@@ -393,6 +397,5 @@ void QComLibrary::createInstanceInternal()
 
-    if ( ! query_done ) {
-
 #ifdef QT_THREAD_SUPPORT
-        QMutexLocker locker( qt_global_mutexpool->get( &cache ) );
+    QMutexLocker locker( qt_global_mutexpool ?
+                         qt_global_mutexpool->get( &cache ) : 0 );
 #endif // QT_THREAD_SUPPORT
@@ -417,3 +420,2 @@ void QComLibrary::createInstanceInternal()
         }
-    }
 
@@ -463,7 +465,2 @@ void QComLibrary::createInstanceInternal()
     if ( queried != reg ) {
-
-#ifdef QT_THREAD_SUPPORT
-        QMutexLocker locker( qt_global_mutexpool->get( &cache ) );
-#endif // QT_THREAD_SUPPORT
-
         cache->writeEntry( regkey, queried );