X-Git-Url: https://vaikene.ee/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Flibs%2FPlugins%2Fpluginmanager.cpp;h=69ca736800cd51e1908d98fa6a1538a010004a78;hb=6f46eb208327c27aacdf84d6c4f7df5078ab24b3;hp=643cad217cdfc4a353e13e74a6184689150601cc;hpb=be0e791df48f5a8c9bb4c16f65b62e41e1149552;p=evaf diff --git a/src/libs/Plugins/pluginmanager.cpp b/src/libs/Plugins/pluginmanager.cpp index 643cad2..69ca736 100644 --- a/src/libs/Plugins/pluginmanager.cpp +++ b/src/libs/Plugins/pluginmanager.cpp @@ -325,7 +325,7 @@ bool PluginManagerPrivate::loadPlugins() void PluginManagerPrivate::unloadPlugins() { // Finalize all the plugins - for (int i = 0; i < mPlugins.size(); ++i) + for (int i = mPlugins.size() - 1; i >= 0; --i) mPlugins.at(i)->done(); while (!mPlugins.isEmpty()) { QExplicitlySharedDataPointer p = mPlugins.takeLast(); @@ -363,7 +363,7 @@ bool PluginManagerPrivate::loadQtPlugin(QString const & name) const #endif #ifdef Q_OS_WIN32 - fileName = QString("%2q%2%3").arg(Common::iApp::instance()->qtPluginsDir()).arg(name).arg("4.dll"); + fileName = QString("%1q%2%3").arg(Common::iApp::instance()->qtPluginsDir()).arg(name).arg("4.dll"); # ifndef QT_NO_DEBUG QString t = QString("%1q%2%3").arg(Common::iApp::instance()->qtPluginsDir()).arg(name).arg("d4.dll"); if (!QFile::exists(t))