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

tony at chromium.org tony at chromium.org
Wed Dec 22 13:37:33 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 439af6c3c7c2b0538901ffd3538643c497332834
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 21:00:30 2010 +0000

    2010-09-21  Tony Chang  <tony at chromium.org>
    
            Unreviewed, QT build fix.
    
            * platform/qt/ClipboardQt.cpp:
            (WebCore::ClipboardQt::ClipboardQt):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3b6906a..2cd846d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-21  Tony Chang  <tony at chromium.org>
+
+        Unreviewed, QT build fix.
+
+        * platform/qt/ClipboardQt.cpp:
+        (WebCore::ClipboardQt::ClipboardQt):
+
 2010-09-21  Andy Estes  <aestes at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/qt/ClipboardQt.cpp b/WebCore/platform/qt/ClipboardQt.cpp
index c87fa6b..90e3bfe 100644
--- a/WebCore/platform/qt/ClipboardQt.cpp
+++ b/WebCore/platform/qt/ClipboardQt.cpp
@@ -91,7 +91,7 @@ ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, ClipboardType clipboardTy
 
 #ifndef QT_NO_CLIPBOARD
     if (policy != ClipboardWritable) {
-        Q_ASSERT(!forDragging);
+        Q_ASSERT(isForCopyAndPaste());
         m_readableData = QApplication::clipboard()->mimeData();
     }
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list