diff options
| author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-02-11 02:24:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-16 00:54:33 (GMT) |
| commit | bc7dca6516a71118c73fcd84dc80cd5a8ba9eaa8 (patch) | |
| tree | e884afb675d9298c0232e8a8575c2aa23edb8663 /src | |
| parent | c6ba330bc92ad8704f53a79f8f79d87c22b1db1e (diff) | |
| download | Qt-bc7dca6516a71118c73fcd84dc80cd5a8ba9eaa8.zip Qt-bc7dca6516a71118c73fcd84dc80cd5a8ba9eaa8.tar.gz Qt-bc7dca6516a71118c73fcd84dc80cd5a8ba9eaa8.tar.bz2 | |
MOBILITY -404 / 507
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qmalloc.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 99bbe42..7e7d7d8 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -864,6 +864,9 @@ typedef quint64 qulonglong; # endif #endif +#define Q_INIT_RESOURCE_EXTERN(name) \ + extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); + #define Q_INIT_RESOURCE(name) \ do { extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); \ QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); } while (0) diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp index 43e89e3..090998c 100644 --- a/src/corelib/global/qmalloc.cpp +++ b/src/corelib/global/qmalloc.cpp @@ -124,3 +124,4 @@ void qFreeAligned(void *ptr) } QT_END_NAMESPACE + |