Changeset 66307 in webkit

Timestamp:

Aug 28, 2010 9:14:19 AM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-08-28 Daniel Bates <​dbates@rim.com>

Attempt to fix the Qt Windows and Qt Linux Release minimal builds
after changeset 66297 <​http://trac.webkit.org/changeset/66297>.

• Api/qwebplugindatabase.cpp: (QWebPluginDatabase::plugins): Wrap the call to PluginPackage::ensurePluginLoaded in #if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE).

Location:

trunk/WebKit/qt

Files:

• Api/qwebplugindatabase.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebplugindatabase.cpp

@@ -285 +285 @@
     for (unsigned int i = 0; i < plugins.size(); ++i) {
         PluginPackage* plugin = plugins[i];
-        if (plugin->ensurePluginLoaded())
-            qwebplugins.append(QWebPluginInfo(plugin));
+#if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE) 
+        if (!plugin->ensurePluginLoaded())
+            continue;
+#endif
+        qwebplugins.append(QWebPluginInfo(plugin));
     }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-08-28  Daniel Bates  <dbates@rim.com>
+
+        Attempt to fix the Qt Windows and Qt Linux Release minimal builds
+        after changeset 66297 <http://trac.webkit.org/changeset/66297>.
+
+        * Api/qwebplugindatabase.cpp:
+        (QWebPluginDatabase::plugins): Wrap the call to PluginPackage::ensurePluginLoaded
+        in #if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE).
+
 2010-08-27  Benjamin Poulain  <benjamin.poulain@nokia.com>