[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 15fb3b655097e1154d2c13996130e3751c8170b2
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 16:14:19 2010 +0000

    2010-08-28  Daniel Bates  <dbates at 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).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebplugindatabase.cpp b/WebKit/qt/Api/qwebplugindatabase.cpp
index 8fdbd36..a7a3b5f 100644
--- a/WebKit/qt/Api/qwebplugindatabase.cpp
+++ b/WebKit/qt/Api/qwebplugindatabase.cpp
@@ -284,8 +284,11 @@ QList<QWebPluginInfo> QWebPluginDatabase::plugins() const
 
     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));
     }
 
     return qwebplugins;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 49ca703..c7dc858 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-28  Daniel Bates  <dbates at 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 at nokia.com>
 
         Reviewed by Antonio Gomes.

-- 
WebKit Debian packaging