[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 306c5e7158d97f7edee81af993424ac86b10da8e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 21:13:40 2010 +0000

    Try to fix the Qt build after r74648.
    
    * WebCore.gypi:
    * WebCore.pro:
    * platform/network/qt/CredentialStorageQt.cpp: Added.
    (WebCore::CredentialStorage::getFromPersistentStorage):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf7181f..44ed643 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-24  Dan Bernstein  <mitz at apple.com>
+
+        Try to fix the Qt build after r74648.
+
+        * WebCore.gypi:
+        * WebCore.pro:
+        * platform/network/qt/CredentialStorageQt.cpp: Added.
+        (WebCore::CredentialStorage::getFromPersistentStorage):
+
 2010-12-24  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index af9d659..4f4b463 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3152,6 +3152,7 @@
             'platform/network/mac/ResourceResponseMac.mm',
             'platform/network/mac/WebCoreURLResponse.h',
             'platform/network/mac/WebCoreURLResponse.mm',
+            'platform/network/qt/CredentialStorageQt.cpp',
             'platform/network/qt/AuthenticationChallenge.h',
             'platform/network/qt/QNetworkReplyHandler.cpp',
             'platform/network/qt/QNetworkReplyHandler.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index cdc3a12..aac760a 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2696,6 +2696,7 @@ SOURCES += \
     platform/graphics/qt/PathQt.cpp \
     platform/graphics/qt/PatternQt.cpp \
     platform/graphics/qt/StillImageQt.cpp \
+    platform/network/qt/CredentialStorageQt.cpp \
     platform/network/qt/ResourceHandleQt.cpp \
     platform/network/qt/ResourceRequestQt.cpp \
     platform/network/qt/DnsPrefetchHelper.cpp \
diff --git a/WebCore/platform/network/qt/CredentialStorageQt.cpp b/WebCore/platform/network/qt/CredentialStorageQt.cpp
new file mode 100644
index 0000000..54ccad0
--- /dev/null
+++ b/WebCore/platform/network/qt/CredentialStorageQt.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CredentialStorage.h"
+
+#include "Credential.h"
+
+namespace WebCore {
+
+Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace&)
+{
+    return Credential();
+}
+
+} // namespace WebCore

-- 
WebKit Debian packaging