summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Riddell <jr@jriddell.org>2016-10-04 09:55:48 (GMT)
committerJonathan Riddell <jr@jriddell.org>2016-10-04 09:55:48 (GMT)
commitda9320eeab35b1ecd25595b24a4ad79075fbf627 (patch)
tree29e9bd77a73d7c271d28a019884512a5db5f0166
parent64bb234dae1a44a7824f5171e2f6e60559198de0 (diff)
don't delete watcher so keep harald happy, use QObject::connect() in a struct which is not a QObject
-rw-r--r--app/kipiinterface.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/kipiinterface.cpp b/app/kipiinterface.cpp
index ce5d5fb..f4067e3 100644
--- a/app/kipiinterface.cpp
+++ b/app/kipiinterface.cpp
@@ -216,7 +216,7 @@ struct KIPIInterfacePrivate
{
mPluginMenu = static_cast<QMenu*>(
mMainWindow->factory()->container("plugins", mMainWindow));
- connect(mPluginMenu, &QMenu::aboutToShow, q, &KIPIInterface::loadPlugins);
+ QObject::connect(mPluginMenu, &QMenu::aboutToShow, q, &KIPIInterface::loadPlugins);
}
QAction * createDummyPluginAction(const QString& text)
@@ -271,7 +271,6 @@ void KIPIInterface::loadPlugins()
if (d->mPluginLoader) {
return;
}
- delete d->mPluginWatcher;
d->mMenuInfoMap[KIPI::ImagesPlugin] = MenuInfo(i18nc("@title:menu", "Images"));
d->mMenuInfoMap[KIPI::ToolsPlugin] = MenuInfo(i18nc("@title:menu", "Tools"));