summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2010-02-11 09:31:40 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-02-11 09:33:04 (GMT)
commit8a8e6d8f0b5368710174726a1c9c2379541899c4 (patch)
tree0eefa4dbe91b1c0799f295bc1e03bd51b7277974 /src/corelib/global/qglobal.h
parente89a552f32592abf6478af3fcd54e05be339acd1 (diff)
downloadQt-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/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h3
1 files changed, 0 insertions, 3 deletions
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)