Changeset 1152 for trunk/src/corelib/plugin/qlibrary_os2.cpp

Timestamp:

Jun 17, 2013, 11:11:39 PM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

core: OS/2: Don't cache plugin load attempts failed due to missing dependencies.

This would hide the plugin from Qt forever, even if all dependencies were later satisfied.
See #289 for details.

File:

• trunk/src/corelib/plugin/qlibrary_os2.cpp (modified) (3 diffs)

trunk/src/corelib/plugin/qlibrary_os2.cpp

@@ -96 +96 @@
 }
 
-bool QLibraryPrivate::load_sys()
+()
 {
     pHnd = 0;
@@ -131 +131 @@
             errorString += QLibrary::tr(" (failed module: %1)")
                 .arg(QFile::decodeName(errModule));
-        return false;
+        pHnd = 0;
+        return rc;
     }
 
@@ -140 +141 @@
     qualifiedFileName = QDir::fromNativeSeparators(QFile::decodeName(QByteArray(errModule)));
 
-    return true;
+    return ;
 }