diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2010-02-11 09:31:40 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2010-02-11 09:33:04 (GMT) |
| commit | 8a8e6d8f0b5368710174726a1c9c2379541899c4 (patch) | |
| tree | 0eefa4dbe91b1c0799f295bc1e03bd51b7277974 /src | |
| parent | e89a552f32592abf6478af3fcd54e05be339acd1 (diff) | |
| download | Qt-8a8e6d8f0b5368710174726a1c9c2379541899c4.zip Qt-8a8e6d8f0b5368710174726a1c9c2379541899c4.tar.gz Qt-8a8e6d8f0b5368710174726a1c9c2379541899c4.tar.bz2 | |
We need to export qBadAlloc() on all platforms
This supports the (documented) case when mixing Qt built without
exception support with code that was built against Qt with exception
support.
Reviewed-by: Robert Griebl
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index f48c1b3..c8f836a 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1994,7 +1994,6 @@ 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 @@ -2003,7 +2002,6 @@ 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 abdafc3..f51849b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1674,10 +1674,7 @@ 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) |