diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
| commit | 3fb36b36de90068db241cc21184a8ac3b899ad2d (patch) | |
| tree | 22490e313f1415681ddfb35f1b0ea0dca8f94ac6 /src/gui/styles | |
| parent | d11e3d6e327677e828918de3173732116976fbe4 (diff) | |
| parent | f34f4ea2d35b92631e98a772e02a1b77ce26681e (diff) | |
| download | Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.zip Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.gz Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qcleanlooksstyle.cpp | 2 | ||||
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 883f511..ada5293 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -884,7 +884,7 @@ void QCleanlooksStyle::drawPrimitive(PrimitiveElement elem, } painter->restore(); break; -#ifndef QT_NO_LINEDIT +#ifndef QT_NO_LINEEDIT case PE_FrameLineEdit: // fall through #endif // QT_NO_LINEEDIT diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index f029602..d18383c 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -1808,7 +1808,7 @@ void qt_mac_fill_background(QPainter *painter, const QRegion &rgn, const QBrush painter->setClipRegion(rgn); - CGContextRef cg = qt_mac_cg_context(target); + QCFType<CGContextRef> cg = qt_mac_cg_context(target); CGContextSaveGState(cg); HIThemeSetFill(kThemeBrushDialogBackgroundActive, 0, cg, kHIThemeOrientationInverted); |