diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/qt/Api/qwebplugindatabase.cpp | |
parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/qt/Api/qwebplugindatabase.cpp')
-rw-r--r-- | Source/WebKit/qt/Api/qwebplugindatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/qt/Api/qwebplugindatabase.cpp b/Source/WebKit/qt/Api/qwebplugindatabase.cpp index a7a3b5f2c..c5328c8f6 100644 --- a/Source/WebKit/qt/Api/qwebplugindatabase.cpp +++ b/Source/WebKit/qt/Api/qwebplugindatabase.cpp @@ -122,8 +122,8 @@ QList<QWebPluginInfo::MimeType> QWebPluginInfo::mimeTypes() const for (MIMEToDescriptionsMap::const_iterator it = mimeToDescriptions.begin(); it != end; ++it) { MimeType mimeType; - mimeType.name = it->first; - mimeType.description = it->second; + mimeType.name = it->key; + mimeType.description = it->value; QStringList fileExtensions; Vector<String> extensions = m_package->mimeToExtensions().get(mimeType.name); |