diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:09:00 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:09:00 (GMT) |
| commit | 4175bad3c2351c3aad0c2d49653b41aaa0dbc02c (patch) | |
| tree | 7c825fe694fe6ed1e174c4680f646583f1ca3b73 /src/corelib | |
| parent | 7a42405649aeea3e709231464d450b5da521e5cb (diff) | |
| parent | e19b6451796d136f1b5796c3afc5fd5492f3dac0 (diff) | |
| download | Qt-4175bad3c2351c3aad0c2d49653b41aaa0dbc02c.zip Qt-4175bad3c2351c3aad0c2d49653b41aaa0dbc02c.tar.gz Qt-4175bad3c2351c3aad0c2d49653b41aaa0dbc02c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index e53fd2d..88f845a 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1929,6 +1929,7 @@ void qt_check_pointer(const char *n, int l) qWarning("In file %s, line %d: Out of memory", n, l); } +#ifndef QT_NO_EXCEPTIONS /* \internal Allows you to throw an exception without including <new> Called internally from Q_CHECK_PTR on certain OS combinations @@ -1937,6 +1938,7 @@ void qBadAlloc() { QT_THROW(std::bad_alloc()); } +#endif /* The Q_ASSERT macro calls this function when the test fails. diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 825b7e8..361c038 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1605,7 +1605,10 @@ Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char * #endif Q_CORE_EXPORT void qt_check_pointer(const char *, int); + +#ifndef QT_NO_EXCEPTIONS Q_CORE_EXPORT void qBadAlloc(); +#endif #ifdef QT_NO_EXCEPTIONS # if defined(QT_NO_DEBUG) |