diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-10-18 09:07:46 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 08:52:05 +0200 |
| commit | 3c2aea92cf7794c05895141dfb2db8e206ce36b5 (patch) | |
| tree | 24c0c4958f51e06609ca5d8a3da92f14813bfdd0 | |
| parent | 47f016f5196aa7d8f7ae9fdbe5fc1ad48a779ee6 (diff) | |
Destroy generic plugins on exit.
Change-Id: I9037cabae74f9a7d8743630d0f530aaa1593266f
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 8 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index a16685e7fa..ee32924f11 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -90,6 +90,8 @@ QPointF QGuiApplicationPrivate::lastCursorPosition(0.0, 0.0); QPlatformIntegration *QGuiApplicationPrivate::platform_integration = 0; +QList<QObject *> QGuiApplicationPrivate::generic_plugin_list; + bool QGuiApplicationPrivate::app_do_modal = false; QPalette *QGuiApplicationPrivate::app_pal = 0; // default application palette @@ -294,6 +296,8 @@ static void init_plugins(const QList<QByteArray> &pluginList) plugin = QGenericPluginFactory::create(QLatin1String(pluginSpec.mid(0, colonPos)), QLatin1String(pluginSpec.mid(colonPos+1))); qDebug() << " created" << plugin; + if (plugin) + QGuiApplicationPrivate::generic_plugin_list.append(plugin); } } @@ -424,6 +428,10 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate() is_app_closing = true; is_app_running = false; + for (int i = 0; i < generic_plugin_list.count(); ++i) + delete generic_plugin_list.at(i); + generic_plugin_list.clear(); + QFont::cleanup(); #ifndef QT_NO_CURSOR diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 20489afe10..bd42fa1904 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -175,6 +175,7 @@ public: static bool quitOnLastWindowClosed; + static QList<QObject *> generic_plugin_list; private: void init(); |