From e7c39180be7abb478b7ee87f2a4880f2aafded52 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 11 Jun 2012 12:28:22 +0200 Subject: [PATCH] Export qMemSet and qMemCopy properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d839564c94a73e3dd2816a8c2196e612e1f5cb79 was incomplete. It added the Q_CORE_EXPORT macro to qmalloc.cpp, but the qMemSet and qMemCopy function bodies are in qglobal.cpp. Change-Id: I24ee44f04365d8dbdf3f1c0f22b6a72cae9f96bb Reviewed-by: Jędrzej Nowacki Reviewed-by: Robin Burchell --- src/corelib/global/qglobal.cpp | 5 +++++ src/corelib/global/qmalloc.cpp | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 6880b9c1be..1bc02e0a70 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -78,6 +78,11 @@ QT_BEGIN_NAMESPACE +#if !QT_DEPRECATED_SINCE(5, 0) +// Make sure they're defined to be exported +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 /*! \class QFlag diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp index a5a8181a80..358b443378 100644 --- a/src/corelib/global/qmalloc.cpp +++ b/src/corelib/global/qmalloc.cpp @@ -55,8 +55,6 @@ QT_BEGIN_NAMESPACE 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