diff options
Diffstat (limited to 'tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp')
-rw-r--r-- | tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp index cefdec9d101..3a9b60099f2 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp @@ -27,22 +27,20 @@ #include <extensionsystem/pluginmanager.h> -#include <qplugin.h> -#include <QObject> - using namespace Plugin2; -MyPlugin2::MyPlugin2() - : initializeCalled(false) +MyPlugin2::~MyPlugin2() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin2::initialize(const QStringList &, QString *) { initializeCalled = true; - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin2")); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName("MyPlugin2"); + ExtensionSystem::PluginManager::addObject(object1); return true; } @@ -52,8 +50,8 @@ void MyPlugin2::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("MyPlugin2_running")); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName("MyPlugin2_running"); + ExtensionSystem::PluginManager::addObject(object2); } |