From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Mon, 28 Jun 2010 16:42:48 +0100 Subject: Merge WebKit at r61871: Initial merge by git. Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5 --- WebCore/plugins/qt/PluginDataQt.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'WebCore/plugins/qt/PluginDataQt.cpp') diff --git a/WebCore/plugins/qt/PluginDataQt.cpp b/WebCore/plugins/qt/PluginDataQt.cpp index 8d4968b..3dc86d0 100644 --- a/WebCore/plugins/qt/PluginDataQt.cpp +++ b/WebCore/plugins/qt/PluginDataQt.cpp @@ -52,8 +52,8 @@ void PluginData::initPlugins() MimeClassInfo mimeInfo; mimeInfo.type = mimeType.name; mimeInfo.desc = mimeType.description; - mimeInfo.suffixes = mimeType.fileExtensions.join(QLatin1String("; ")); - mimeInfo.pluginIndex = m_plugins.size(); + for (int k = 0; k < mimeType.fileExtensions.count(); ++k) + mimeInfo.extensions.append(mimeType.fileExtensions.at(k)); info.mimes.append(mimeInfo); } @@ -80,16 +80,7 @@ void PluginData::initPlugins() mime.type = it->first; mime.desc = it->second; - mime.pluginIndex = m_plugins.size(); - - Vector extensions = package->mimeToExtensions().get(mime.type); - - for (unsigned i = 0; i < extensions.size(); i++) { - if (i > 0) - mime.suffixes += ","; - - mime.suffixes += extensions[i]; - } + mime.extensions = package->mimeToExtensions().get(mime.type); info.mimes.append(mime); } -- cgit v1.1