diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:06 -0800 |
| commit | b880d713c04257ca40abfef97c300afdead423b8 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/plugins/qt/PluginDataQt.cpp | |
| parent | e2e7a5c57b53f01e63a0245b4420d54b454cb373 (diff) | |
| parent | 643ca7872b450ea4efacab6188849e5aac2ba161 (diff) | |
| download | external_webkit-b880d713c04257ca40abfef97c300afdead423b8.zip external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.gz external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.bz2 | |
am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/plugins/qt/PluginDataQt.cpp')
| -rw-r--r-- | WebCore/plugins/qt/PluginDataQt.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/plugins/qt/PluginDataQt.cpp b/WebCore/plugins/qt/PluginDataQt.cpp index 5478d38..a836937 100644 --- a/WebCore/plugins/qt/PluginDataQt.cpp +++ b/WebCore/plugins/qt/PluginDataQt.cpp @@ -24,18 +24,15 @@ #include "PluginDatabase.h" #include "PluginPackage.h" -#if QT_VERSION >= 0x040400 #include "ChromeClientQt.h" #include "Page.h" #include <qwebpage.h> #include <qwebpluginfactory.h> -#endif namespace WebCore { void PluginData::initPlugins() { -#if QT_VERSION >= 0x040400 QWebPage* webPage = static_cast<ChromeClientQt*>(m_page->chrome()->client())->m_webPage; QWebPluginFactory* factory = webPage->pluginFactory(); if (factory) { @@ -62,7 +59,6 @@ void PluginData::initPlugins() m_plugins.append(info); } } -#endif PluginDatabase *db = PluginDatabase::installedPlugins(); const Vector<PluginPackage*> &plugins = db->plugins(); |