Remove "no-stl" from the build key and add compatibility for old plugins.

STL support hasn't had binary compatibility effects for the entire
lifetime of Qt 4, so it should never have been there. It is a legacy
thing I am now correcting.

When inspecting a plugin, remove the "no-stl" from its loaded build
key. That indicates a pre-4.6 build, since now Qt no longer adds it to
its own build keys.

Note that you have to remove the 4.6 plugin cache from
$HOME/.config/Trolltech.conf or the registry for this change to work
(if you compile Qt with -no-stl). Otherwise, plugins that have already
been scanned will fail to load.

Reviewed-by: Bradley T. Hughes

1 files changed, 4 insertions, 1 deletions

diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 8f364bac1b..309bfb8854 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -667,12 +667,15 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
 #endif
         }
 
+        // Qt 4.5 compatibility: stl doesn't affect binary compatibility
+        key.replace(" no-stl", "");
+
+#ifndef QT_NO_SETTINGS
         QStringList queried;
         queried << QString::number(qt_version,16)
                 << QString::number((int)debug)
                 << QLatin1String(key)
                 << lastModified;
-#ifndef QT_NO_SETTINGS
         settings->setValue(regkey, queried);
 #endif
     }