Changeset 1155 for trunk/src

Timestamp:

Jun 18, 2013, 12:52:07 AM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

core: Cache error string on plugin load failure.

This makes sure that QPluginLoader::load() will give a real error message for cached
failures instead of a default one (which may not match the real failure at all).

File:

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

trunk/src/corelib/plugin/qlibrary.cpp

@@ -635 +635 @@
     reg = settings->value(regkey).toStringList();
 #endif
-    if (reg.count() == 5 && lastModified == reg.at(3) && fileinfo.size() == reg.at(4).toLongLong()) {
+    if (reg.count() >=5 && reg.count() <= 6 && lastModified == reg.at(3) && fileinfo.size() == reg.at(4).toLongLong()) {
         qt_version = reg.at(0).toUInt(0, 16);
         debug = bool(reg.at(1).toInt());
         key = reg.at(2).toLatin1();
         success = qt_version != 0;
+        if (!success && reg.count() == 6)
+            errorString = reg.at(5);
     } else {
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)
@@ -705 +707 @@
                 qt_version = 0;
                 key = "unknown";
+                if (errorString.isEmpty())
+                    errorString = QLibrary::tr("The file '%1' is not a valid Qt plugin.").arg(fileName);
             } else {
                 success = true;
@@ -735 +739 @@
                     << lastModified
                     << QString::number(fileinfo.size());
+            if (qt_version == 0 && !errorString.isEmpty())
+                queried << errorString;
             settings->setValue(regkey, queried);
         }