Changeset 1152 for trunk

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.

Location:

trunk/src/corelib/plugin

Files:

• qlibrary.cpp (modified) (6 diffs)
• qlibrary_os2.cpp (modified) (3 diffs)
• qlibrary_p.h (modified) (1 diff)

trunk/src/corelib/plugin/qlibrary.cpp

@@ -582 +582 @@
     QByteArray key;
     bool success = false;
+    bool temporary_failure = false;
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -662 +663 @@
                 if (fileinfo.exists())
 #  endif
-                temporary_load =  load_sys();
+#  if defined(Q_OS_OS2)
+                APIRET rc = load_sys_rc();
+                temporary_load = rc == NO_ERROR;
+                temporary_failure = rc == ERROR_FILE_NOT_FOUND;
+#  else
+                temporary_load = load_sys();
+#  endif
 #endif
             }
@@ -698 +705 @@
                 qt_version = 0;
                 key = "unknown";
-                if (temporary_load)
-                    unload_sys();
             } else {
                 success = true;
@@ -709 +714 @@
                     hTempModule = 0;
                 }
-
             }
+#else
+            if (temporary_load)
+                unload_sys();
 #endif
         }
@@ -718 +725 @@
 
 #ifndef QT_NO_SETTINGS
-        QStringList queried;
-        queried << QString::number(qt_version,16)
-                << QString::number((int)debug)
-                << QLatin1String(key)
-                << lastModified;
-        settings->setValue(regkey, queried);
+        // Loading may fail due to a temporary failure like missing dependencies.
+        // Do not caches such failures since in this case the plugin will be
+        // ignored by Qt forever - even when these failures are fixed later.
+        if (!temporary_failure) {
+            QStringList queried;
+            queried << QString::number(qt_version,16)
+                    << QString::number((int)debug)
+                    << QLatin1String(key)
+                    << lastModified;
+            settings->setValue(regkey, queried);
+        }
 #endif
     }
@@ -734 +746 @@
                 errorString = QLibrary::tr("The file '%1' is not a valid Qt plugin.").arg(fileName);
         }
+        pluginState = temporary_failure ? MightBeAPlugin : IsNotAPlugin;
         return false;
     }

trunk/src/corelib/plugin/qlibrary_os2.cpp

@@ -96 +96 @@
 }
 
-bool QLibraryPrivate::load_sys()
+APIRET QLibraryPrivate::load_sys_rc()
 {
     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 NO_ERROR;
 }
 

trunk/src/corelib/plugin/qlibrary_p.h

@@ -109 +109 @@
     ~QLibraryPrivate();
 
+#if defined(Q_OS_OS2)
+    APIRET load_sys_rc();
+    bool load_sys() { return load_sys_rc() == NO_ERROR; }
+#else
     bool load_sys();
+#endif
     bool unload_sys();
     void *resolve_sys(const char *);