diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 20:24:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 20:24:48 (GMT) |
| commit | e3f342d60cb25a7c90f9401102c750e239a16e53 (patch) | |
| tree | 7002fc6778d4471b310795446ce9d2c0e576d5a7 | |
| parent | 9aaf834f9c31cb91cb7dd0693709e6754d836d85 (diff) | |
| parent | 8a8e6d8f0b5368710174726a1c9c2379541899c4 (diff) | |
| download | Qt-e3f342d60cb25a7c90f9401102c750e239a16e53.zip Qt-e3f342d60cb25a7c90f9401102c750e239a16e53.tar.gz Qt-e3f342d60cb25a7c90f9401102c750e239a16e53.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
We need to export qBadAlloc() on all platforms
| -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) |