diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 13:54:02 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 13:54:02 (GMT) |
| commit | 86b28b0bf7ddd278f1b878db0b5961762e9272b2 (patch) | |
| tree | e7481368b6051de08fd5d43d784beac8ace2c893 /src/corelib/global/qglobal.h | |
| parent | d9911390f17426801f553cb82654e102fe0400b9 (diff) | |
| download | Qt-86b28b0bf7ddd278f1b878db0b5961762e9272b2.zip Qt-86b28b0bf7ddd278f1b878db0b5961762e9272b2.tar.gz Qt-86b28b0bf7ddd278f1b878db0b5961762e9272b2.tar.bz2 | |
namespace fixes. s60main and corelib now compiles under a namespace
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 361c038..6e9250f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -795,6 +795,9 @@ namespace QT_NAMESPACE {} # define Q_WS_WIN #endif +// forward declare std::exception +namespace std { class exception; } + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -2315,8 +2318,6 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #if defined(Q_OS_SYMBIAN) -// forward declare std::exception -namespace std { class exception; } Q_CORE_EXPORT void qt_translateSymbianErrorToException(int error); Q_CORE_EXPORT void qt_translateExceptionToSymbianErrorL(const std::exception& ex); |