From 5185a28139800a9fef49dabc6c110e017f83cdd6 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Wed, 28 Mar 2012 12:07:19 +1000 Subject: Fix a crash in QFactoryLoader The change in plugin loading has meant that different plugins in the same plugin folder will not be handled properly when loaded with different instances of QFactoryLoader. A solution is to only unload compatability plugins from QFactoryLoader::update() since they are the only plugins that are actually loaded in that method. This auto test shows the error on the current version of QFactoryLoader and passes with the fix described above. Change-Id: I12001525d51bb631d6742c5965357598322f247c Reviewed-by: Lars Knoll --- .../auto/corelib/plugin/qfactoryloader/qfactoryloader.pro | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro (limited to 'tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro') diff --git a/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro b/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro new file mode 100644 index 0000000000..42bc01e2ed --- /dev/null +++ b/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro @@ -0,0 +1,15 @@ +QT = core-private +TEMPLATE = subdirs +CONFIG += ordered +SUBDIRS = \ + plugin1 \ + plugin2 \ + test + +TARGET = tst_qpluginloader + +# no special install rule for subdir +INSTALLS = + + +CONFIG += parallel_test -- cgit v1.2.3