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/corelib/global | |
| 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/corelib/global')
| -rw-r--r-- | src/corelib/global/qisenum.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/global/qisenum.h b/src/corelib/global/qisenum.h index c9b6ec6695..40b576e831 100644 --- a/src/corelib/global/qisenum.h +++ b/src/corelib/global/qisenum.h @@ -44,9 +44,6 @@ #ifndef QISENUM_H #define QISENUM_H -QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE - #ifndef Q_IS_ENUM # if defined(Q_CC_GNU) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) # define Q_IS_ENUM(x) __is_enum(x) @@ -58,7 +55,4 @@ QT_BEGIN_NAMESPACE # endif #endif -QT_END_HEADER -QT_END_NAMESPACE - #endif // QISENUM_H |