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

[darin]

The following commit has been merged in the debian/unstable branch:
commit e1b4ca00924830b6e7a52ec0d6e0a3bef674973a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 22 23:29:42 2003 +0000

            * kwq/KWQTextEdit.mm: (QTextEdit::sizeWithColumnsAndRows): Made it compile.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 423f580..8495f66 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,9 @@
 2003-09-22  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQTextEdit.mm: (QTextEdit::sizeWithColumnsAndRows): Made it compile.
+
+2003-09-22  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - fixed 3306041 -- Airborne tracking number field too narrow, tracking doesn't work (textare col property)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 423f580..8495f66 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,9 @@
 2003-09-22  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQTextEdit.mm: (QTextEdit::sizeWithColumnsAndRows): Made it compile.
+
+2003-09-22  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - fixed 3306041 -- Airborne tracking number field too narrow, tracking doesn't work (textare col property)
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index 7ea8f11..311da4c 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -132,5 +132,6 @@ void QTextEdit::setAlignment(AlignmentFlags alignment)
 QSize QTextEdit::sizeWithColumnsAndRows(int numColumns, int numRows) const
 {
     KWQTextArea *textArea = getView();
-    return [textArea sizeWithColumns:numColumns rows:numRows];
+    NSSize size = [textArea sizeWithColumns:numColumns rows:numRows];
+    return QSize((int)ceil(size.width), (int)ceil(size.height));
 }

-- 
WebKit Debian packaging