[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:11:09 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 70ecfbbe45165654ac3b8f5308298ace676a1a0a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 12 09:20:01 2003 +0000

    Fix build bustage in deployment builds.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5463 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 50a379b..d00fb32 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-11-12  David Hyatt  <hyatt at apple.com>
+
+	Fix build bustage in deployment builds.
+
+        * kwq/KWQLineEdit.mm:
+        (QLineEdit::hasMarkedText):
+
 2003-11-11  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3481134, shorthand parsing in CSS does not fill in omitted values.  The fix is to implement
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index 0895953..aa9768f 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -220,11 +220,10 @@ void QLineEdit::clicked()
 
 bool QLineEdit::hasMarkedText()
 {
-    bool result = false;
     KWQ_BLOCK_EXCEPTIONS;
-    result = [[NSInputManager currentInputManager] hasMarkedText];
+    return [[NSInputManager currentInputManager] hasMarkedText];
     KWQ_UNBLOCK_EXCEPTIONS;
-    return result;
+    return false;
 }
 
 void QLineEdit::setAlignment(AlignmentFlags alignment)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list