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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit b1c2711ee8674208f15e672472fba72af50f7aee
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 19 14:23:37 2001 +0000

    Fixed inadvertent horkage by rjw
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@372 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 861a22e..5d80c63 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -401,7 +401,8 @@ void QPainter::drawText(int x, int y, const QString &qstring, int len)
     
     _lockFocus();
     
-    font = data->qfont.data->font;    
+    //font = data->qfont.data->font;    
+    font = data->qfont.font;    
     
     if (len == -1)
         string = QSTRING_TO_NSSTRING(qstring);
@@ -427,7 +428,8 @@ void QPainter::drawText(int x, int y, int w, int h, int flags, const QString&qst
     
     _lockFocus();
     
-    font = data->qfont.data->font;    
+    //font = data->qfont.data->font;    
+    font = data->qfont.font;    
     
     if (len == -1)
         string = QSTRING_TO_NSSTRING(qstring);
diff --git a/WebCore/src/kwq/KWQPainter.mm b/WebCore/src/kwq/KWQPainter.mm
index 861a22e..5d80c63 100644
--- a/WebCore/src/kwq/KWQPainter.mm
+++ b/WebCore/src/kwq/KWQPainter.mm
@@ -401,7 +401,8 @@ void QPainter::drawText(int x, int y, const QString &qstring, int len)
     
     _lockFocus();
     
-    font = data->qfont.data->font;    
+    //font = data->qfont.data->font;    
+    font = data->qfont.font;    
     
     if (len == -1)
         string = QSTRING_TO_NSSTRING(qstring);
@@ -427,7 +428,8 @@ void QPainter::drawText(int x, int y, int w, int h, int flags, const QString&qst
     
     _lockFocus();
     
-    font = data->qfont.data->font;    
+    //font = data->qfont.data->font;    
+    font = data->qfont.font;    
     
     if (len == -1)
         string = QSTRING_TO_NSSTRING(qstring);

-- 
WebKit Debian packaging