diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2012-03-21 16:45:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-26 05:39:37 +0200 |
| commit | a760289038f3775cc399a8f47c36b9bce525c1a1 (patch) | |
| tree | ee913b5717dc35c73bba92ba6acde105454a167e /src/plugins/platforms/cocoa/qmacmime.h | |
| parent | 1dc7aed0e9632c4da7aa1b182cd5198b913b912f (diff) | |
Fix qtnamespace compile break on Mac.
Appears as though the QT_NAMESPACE macros are incorrect here.
In fact in qisenum.h because the #define is no respecter of a namespace
in most of these conditional compile cases they will be ignored
effectively. The QT_HEADER also - if qtypetraits.h conditional compile
occurs then it will result in adding extern "C" { twice. For the macros
invoking them will not cause the extern "C" { to be used anyway, so just
remove this altogether.
Task-number: QTBUG-24903
Change-Id: I710dc330f58357f395241a0cf3172e41a5864576
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmacmime.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qmacmime.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qmacmime.h b/src/plugins/platforms/cocoa/qmacmime.h index 7226caef28..12c9aff039 100644 --- a/src/plugins/platforms/cocoa/qmacmime.h +++ b/src/plugins/platforms/cocoa/qmacmime.h @@ -46,6 +46,8 @@ #include <CoreFoundation/CoreFoundation.h> +QT_BEGIN_NAMESPACE + class Q_GUI_EXPORT QMacPasteboardMime { char type; public: @@ -74,5 +76,7 @@ public: virtual QList<QByteArray> convertFromMime(const QString &mime, QVariant data, QString flav) = 0; }; +QT_END_NAMESPACE + #endif |