summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qmalloc.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-20 13:37:58 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-08-14 09:59:36 +0200
commit9ee554ac1d1af97e7ad5b4bf78e2779f7d1c405f (patch)
treec40e65aa3b2f7d02c32b592855c8c03252909c2b /src/corelib/global/qmalloc.cpp
parentff555d89650f5cea72365e12fb2b71be9e25b89d (diff)
qglobal.h: remove deprecated global functions
Since 5.0 - qMalloc(), qFree(), qRealloc(), qMemCopy(), qMemSet() Since 5.15 - qsrand(), qrand() Change-Id: I74fa3d17b05521271c3dc563fc85a5b133289ce3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global/qmalloc.cpp')
-rw-r--r--src/corelib/global/qmalloc.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp
index b071c1df62..fbea0e5689 100644
--- a/src/corelib/global/qmalloc.cpp
+++ b/src/corelib/global/qmalloc.cpp
@@ -49,29 +49,6 @@
QT_BEGIN_NAMESPACE
-#if !QT_DEPRECATED_SINCE(5, 0)
-// Make sure they're defined to be exported
-Q_CORE_EXPORT void *qMalloc(size_t size) Q_ALLOC_SIZE(1);
-Q_CORE_EXPORT void qFree(void *ptr);
-Q_CORE_EXPORT void *qRealloc(void *ptr, size_t size) Q_ALLOC_SIZE(2);
-#endif
-
-
-void *qMalloc(size_t size)
-{
- return ::malloc(size);
-}
-
-void qFree(void *ptr)
-{
- ::free(ptr);
-}
-
-void *qRealloc(void *ptr, size_t size)
-{
- return ::realloc(ptr, size);
-}
-
void *qMallocAligned(size_t size, size_t alignment)
{
return qReallocAligned(nullptr, size, 0, alignment);