From 3ae2dce9118c0d37cdfed60b07c83cdd20ef3e36 Mon Sep 17 00:00:00 2001 From: Sarah Smith Date: Tue, 6 Mar 2012 11:51:22 +1000 Subject: 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 --- src/plugins/platforms/cocoa/qcocoasystemsettings.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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 +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 qt_mac_createRolePalettes() } return palettes; } + +QT_END_NAMESPACE -- cgit v1.2.3