| author | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
| commit | 155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (patch) (side-by-side diff) | |
| tree | e6edaa5a7040fe6c224c3943d1094dcf02e4f74c /qmake/tools/qcomlibrary.cpp | |
| parent | 86703e8a5527ef114facd02c005b6b3a7e62e263 (diff) | |
| download | opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.zip opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.gz opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.bz2 | |
update qmake to 1.05a
| -rw-r--r-- | qmake/tools/qcomlibrary.cpp | 15 |
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 @@ -63,6 +63,10 @@ QComLibrary::~QComLibrary() { if ( autoUnload() ) unload(); + if ( libiface ) + libiface->release(); + if ( entry ) + entry->release(); } bool QComLibrary::unload() @@ -391,10 +395,9 @@ void QComLibrary::createInstanceInternal() bool query_done = FALSE; bool warn_mismatch = TRUE; - 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 if ( ! cache ) { @@ -415,7 +418,6 @@ void QComLibrary::createInstanceInternal() warn_mismatch = FALSE; } } - } #if defined(Q_OS_UNIX) if ( ! query_done ) { @@ -461,11 +463,6 @@ void QComLibrary::createInstanceInternal() << lastModified; if ( queried != reg ) { - -#ifdef QT_THREAD_SUPPORT - QMutexLocker locker( qt_global_mutexpool->get( &cache ) ); -#endif // QT_THREAD_SUPPORT - cache->writeEntry( regkey, queried ); // delete the cache, which forces the settings to be written delete cache; |