diff -r 93b982ccede2 -r 5daf16870df6 src/gui/painting/qpaintengine_mac.cpp
--- a/src/gui/painting/qpaintengine_mac.cpp	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/gui/painting/qpaintengine_mac.cpp	Thu Jul 22 16:41:55 2010 +0100
@@ -118,9 +118,10 @@
             QRegion clip = p->paintEngine()->systemClip();
             QTransform native = p->deviceTransform();
             QTransform logical = p->combinedTransform();
+
             if (p->hasClipping()) {
                 QRegion r = p->clipRegion();
-                r.translate(native.dx() - logical.dx(), native.dy() - logical.dy());
+                r.translate(native.dx(), native.dy());
                 if (clip.isEmpty())
                     clip = r;
                 else
@@ -128,10 +129,7 @@
             }
             qt_mac_clip_cg(context, clip, 0);
 
-            QPainterState *state = static_cast<QPainterState *>(pe->state);
-            Q_ASSERT(state);
-            if (!state->redirectionMatrix.isIdentity())
-                CGContextTranslateCTM(context, state->redirectionMatrix.dx(), state->redirectionMatrix.dy());
+            CGContextTranslateCTM(context, native.dx(), native.dy());
         }
     }
     CGContextRetain(context);
@@ -1392,7 +1390,11 @@
         CGContextSetInterpolationQuality(d->hd, (hints & QPainter::SmoothPixmapTransform) ?
                                          kCGInterpolationHigh : kCGInterpolationNone);
     }
-    CGContextSetShouldSmoothFonts(d->hd, hints & QPainter::TextAntialiasing);
+    bool textAntialiasing = (hints & QPainter::TextAntialiasing) == QPainter::TextAntialiasing;
+    if (!textAntialiasing || d->disabledSmoothFonts) {
+        d->disabledSmoothFonts = !textAntialiasing;
+        CGContextSetShouldSmoothFonts(d->hd, textAntialiasing);
+    }
 }
 
 /*