diff options
Diffstat (limited to 'tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp')
-rw-r--r-- | tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp index b5f32ea1c7..a75ee58241 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp @@ -27,22 +27,20 @@ #include <extensionsystem/pluginmanager.h> -#include <qplugin.h> -#include <QObject> - using namespace Plugin3; -MyPlugin3::MyPlugin3() - : initializeCalled(false) +MyPlugin3::~MyPlugin3() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin3::initialize(const QStringList & /*arguments*/, QString *errorString) { initializeCalled = true; - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin3")); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName(QLatin1String("MyPlugin3")); + ExtensionSystem::PluginManager::addObject(object1); bool found2 = false; foreach (QObject *object, ExtensionSystem::PluginManager::allObjects()) { @@ -61,7 +59,7 @@ void MyPlugin3::extensionsInitialized() if (!initializeCalled) return; // don't do this at home, it's just done here for the test - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin3_running")); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName(QLatin1String("MyPlugin3_running")); + ExtensionSystem::PluginManager::addObject(object2); } |