diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2012-03-06 11:51:22 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 02:02:50 +0100 |
| commit | 3ae2dce9118c0d37cdfed60b07c83cdd20ef3e36 (patch) | |
| tree | 29def815c8803b4da8e067cb3a4cd1a4a76c9437 /src/plugins | |
| parent | a47d974e19512ae5a445f64fbd2b1703201f781d (diff) | |
Compile with -qtnamespace
Mac has to work with -qtnamespace as well, and other files have gotten
this right, so follow their example.
Change-Id: I551e1843e8a0e82a82d1d5ea8c8cd5f20e6880fa
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoasystemsettings.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm index eea2fb6f5d..d5b2fce2e7 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm @@ -45,6 +45,8 @@ #include <Carbon/Carbon.h> +QT_BEGIN_NAMESPACE + QColor qt_mac_colorFromCGColor(CGColorRef cgcolor) { QColor pc; @@ -144,7 +146,6 @@ QPalette * qt_mac_createSystemPalette() return palette; } - struct QMacPaletteMap { inline QMacPaletteMap(QPlatformTheme::Palette p, ThemeBrush a, ThemeBrush i) : paletteRole(p), active(a), inactive(i) { } @@ -227,3 +228,5 @@ QHash<QPlatformTheme::Palette, QPalette*> qt_mac_createRolePalettes() } return palettes; } + +QT_END_NAMESPACE |