diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebCore/platform/qt/MIMETypeRegistryQt.cpp | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebCore/platform/qt/MIMETypeRegistryQt.cpp')
| -rw-r--r-- | WebCore/platform/qt/MIMETypeRegistryQt.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/WebCore/platform/qt/MIMETypeRegistryQt.cpp b/WebCore/platform/qt/MIMETypeRegistryQt.cpp index 6b3e243..9f4a786 100644 --- a/WebCore/platform/qt/MIMETypeRegistryQt.cpp +++ b/WebCore/platform/qt/MIMETypeRegistryQt.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2006 Zack Rusin <zack@kde.org> * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2007 Trolltech ASA + * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,11 +28,6 @@ #include "config.h" #include "MIMETypeRegistry.h" -#include "NotImplemented.h" -#if QT_VERSION < 0x040400 -#include "qwebobjectplugin_p.h" -#endif - namespace WebCore { struct ExtensionMap { @@ -42,6 +37,7 @@ struct ExtensionMap { static const ExtensionMap extensionMap [] = { { "bmp", "image/bmp" }, + { "css", "text/css" }, { "gif", "image/gif" }, { "html", "text/html" }, { "htm", "text/html" }, @@ -79,12 +75,6 @@ String MIMETypeRegistry::getMIMETypeForExtension(const String &ext) return e->mimeType; ++e; } - // ### FIXME: Qt 4.4 -#if QT_VERSION < 0x040400 - QString type = QWebFactoryLoader::self()->mimeTypeForExtension(ext); - if (!type.isEmpty()) - return type; -#endif return "application/octet-stream"; } |