summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-03 17:22:07 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-05 22:02:22 +0200
commitd839564c94a73e3dd2816a8c2196e612e1f5cb79 (patch)
treeb46f3b7856e513348d43889d7a224b519f78c34c
parent32804a5b16ae30e42ccc46f65df314fc1a940970 (diff)
Make sure we export the non-inline qMalloc & friends functions
If QtCore is built with Qt 5.0 API, the Q_CORE_EXPORT does not appear anywhere and these functions wouldn't get exported, despite being defined. So make sure that they get the Q_CORE_EXPORT attribute. Change-Id: I0684ea1b9ad634c13dca12c97683032e44f6a290 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
-rw-r--r--src/corelib/global/qmalloc.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp
index a6d3b4f418..4cd1b485df 100644
--- a/src/corelib/global/qmalloc.cpp
+++ b/src/corelib/global/qmalloc.cpp
@@ -50,6 +50,16 @@
QT_BEGIN_NAMESPACE
+#if !QT_DEPRECATED_SINCE(5, 0)
+// Make sure they're defined to be exportedgit
+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);
+Q_CORE_EXPORT void *qMemCopy(void *dest, const void *src, size_t n);
+Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n);
+#endif
+
+
void *qMalloc(size_t size)
{
return ::malloc(size);