diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 10:24:39 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 10:24:39 +0200 |
| commit | 92a3662564f421a46761989d153f6c8eb990131f (patch) | |
| tree | 63910a248879fb2b4007450fed01f37626355bbb /src/gui | |
| parent | 2e1653563a801909788c912ed8071afe8bf4ba05 (diff) | |
| parent | d22b55d3159c001dc6b37422cefbec6775996494 (diff) | |
Merge branch '4.5' into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_embedded.ui | 1 | ||||
| -rw-r--r-- | src/gui/painting/qpaintengine_mac.cpp | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog_embedded.ui b/src/gui/dialogs/qfiledialog_embedded.ui index 1bd189e414..f134f64188 100644 --- a/src/gui/dialogs/qfiledialog_embedded.ui +++ b/src/gui/dialogs/qfiledialog_embedded.ui @@ -2,6 +2,7 @@ <comment>********************************************************************* ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtGui module of the Qt Toolkit. ** diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp index 934b3850be..249bcfa271 100644 --- a/src/gui/painting/qpaintengine_mac.cpp +++ b/src/gui/painting/qpaintengine_mac.cpp @@ -116,11 +116,15 @@ QMacCGContext::QMacCGContext(QPainter *p) if (devType == QInternal::Widget) { 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()); if (clip.isEmpty()) - clip = p->clipRegion(); + clip = r; else - clip &= p->clipRegion(); + clip &= r; } qt_mac_clip_cg(context, clip, 0); |