aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp')
-rw-r--r--tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp
index 6405c26668..0bb1fc8842 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp
@@ -27,22 +27,20 @@
#include <extensionsystem/pluginmanager.h>
-#include <qplugin.h>
-#include <QObject>
-
using namespace Plugin1;
-MyPlugin1::MyPlugin1()
- : initializeCalled(false)
+MyPlugin1::~MyPlugin1()
{
+ ExtensionSystem::PluginManager::removeObject(object1);
+ ExtensionSystem::PluginManager::removeObject(object2);
}
bool MyPlugin1::initialize(const QStringList & /*arguments*/, QString *errorString)
{
initializeCalled = true;
- QObject *obj = new QObject;
- obj->setObjectName(QLatin1String("MyPlugin1"));
- addAutoReleasedObject(obj);
+ object1 = new QObject(this);
+ object1->setObjectName(QLatin1String("MyPlugin1"));
+ ExtensionSystem::PluginManager::addObject(object1);
bool found2 = false;
bool found3 = false;
@@ -70,8 +68,8 @@ void MyPlugin1::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("MyPlugin1_running"));
- addAutoReleasedObject(obj);
+ object2 = new QObject(this);
+ object2->setObjectName(QLatin1String("MyPlugin1_running"));
+ ExtensionSystem::PluginManager::addObject(object2);
}