diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-11 12:28:22 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 17:35:15 +0200 |
| commit | e7c39180be7abb478b7ee87f2a4880f2aafded52 (patch) | |
| tree | bf27233921dee0b75fec64ff6dabf4dc4d350c8b /src/corelib | |
| parent | 53546ce0b6ac033bb3c8c26fcdc886c824f09184 (diff) | |
Export qMemSet and qMemCopy properly
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 <jedrzej.nowacki@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 5 | ||||
| -rw-r--r-- | 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 |