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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2403f728e7093d016afd7114c3e927c2f0e9aace
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 14:42:30 2010 +0000

    2010-11-19  Sam Magnuson  <smagnuso at gmail.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Compile with QT_NO_CLIPBOARD
            https://bugs.webkit.org/show_bug.cgi?id=49742
    
            * platform/qt/PasteboardQt.cpp:
            (WebCore::Pasteboard::canSmartReplace):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72394 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4d501c4..f3bd953 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-19  Sam Magnuson  <smagnuso at gmail.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Compile with QT_NO_CLIPBOARD
+        https://bugs.webkit.org/show_bug.cgi?id=49742
+
+        * platform/qt/PasteboardQt.cpp:
+        (WebCore::Pasteboard::canSmartReplace):
+
 2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/qt/PasteboardQt.cpp b/WebCore/platform/qt/PasteboardQt.cpp
index ac54fdb..b98e84e 100644
--- a/WebCore/platform/qt/PasteboardQt.cpp
+++ b/WebCore/platform/qt/PasteboardQt.cpp
@@ -77,8 +77,10 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete,
 
 bool Pasteboard::canSmartReplace()
 {
+#ifndef QT_NO_CLIPBOARD
     if (QApplication::clipboard()->mimeData()->hasFormat((QLatin1String("application/vnd.qtwebkit.smartpaste"))))
         return true;
+#endif
     return false;
 }
 

-- 
WebKit Debian packaging