aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-02-21 10:03:38 +0100
committerhjk <hjk@qt.io>2018-02-23 08:57:49 +0000
commit31a55b02477fa0c6b9b9fca7e26ebc6951c3be30 (patch)
treef588d537807b8b54715a834819115aed470b0df4 /tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
parent34fec1cad23e2c6fe8ecf907419b231817e27564 (diff)
ExtensionSystem: Remove per-plugin object pools
Remove now-unused IPlugin::addAutoReleasedObject and IPlugin:: {add,remove}Object convenience functions that were only forwarding to the global pool. Adjust all related tests. All previous users of these convenience functions are gone, and we do not want to encourage the use of object pool anymore. Plugins that wish to share objects to implement weak dependencies can use the global object pool via ExtensionSystem::PluginManager:: {add,remove}Object directly. Change-Id: Ic668ad5504af76963f6d4c69ae160438efc70db5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h')
-rw-r--r--tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
index e5e38e33005..adaf926905e 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
@@ -27,9 +27,6 @@
#include <extensionsystem/iplugin.h>
-#include <QObject>
-#include <QtGlobal>
-
#if defined(PLUGIN2_LIBRARY)
# define PLUGIN2_EXPORT Q_DECL_EXPORT
#else
@@ -44,10 +41,10 @@ class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "plugin" FILE "plugin2.json")
public:
- MyPlugin2();
+ MyPlugin2() = default;
- bool initialize(const QStringList &arguments, QString *errorString);
- void extensionsInitialized();
+ bool initialize(const QStringList &arguments, QString *errorString) final;
+ void extensionsInitialized() final;
};
} // Plugin2