diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /src/widgets/styles/qmacstyle_mac.mm | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/widgets/styles/qmacstyle_mac.mm')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 1f91fa4d00..7e07cc1532 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -6390,6 +6390,7 @@ CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintDevice) CGContextRelease the context when finished using it. \warning This function is only available on Mac OS X. + \warning This function is duplicated in the Cocoa platform plugin. */ CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) |