diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-11-12 18:21:25 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-13 10:57:53 (GMT) |
| commit | 0a07ca79318ba1b735ce0b3a208e471e4a24e1f2 (patch) | |
| tree | dfa811b877ae6b79ac91ab976ee7c3b1afd0d073 | |
| parent | 99c42254480fb147b0aaa01458300bae4472e3d8 (diff) | |
| download | Qt-0a07ca79318ba1b735ce0b3a208e471e4a24e1f2.zip Qt-0a07ca79318ba1b735ce0b3a208e471e4a24e1f2.tar.gz Qt-0a07ca79318ba1b735ce0b3a208e471e4a24e1f2.tar.bz2 | |
Fix corelib def files for the new atomics implementation
4.6.0 has the wrong atomics implementation for symbian, as the team
branch was not merged before the freeze.
This updates the def files to match the implementation on the team
branch so that it can be cherry-picked.
Task-number: QTBUG-5752
Reviewed-by: Iain
| -rw-r--r-- | src/s60installs/bwins/QtCoreu.def | 3 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtCoreu.def | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index 146d47e..1218b75 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -4384,4 +4384,7 @@ EXPORTS ?staticMetaObject@QAbstractTableModel@@2UQMetaObject@@B @ 4383 NONAME ; struct QMetaObject const QAbstractTableModel::staticMetaObject ?staticMetaObject@QFile@@2UQMetaObject@@B @ 4384 NONAME ; struct QMetaObject const QFile::staticMetaObject ?staticMetaObject@QHistoryState@@2UQMetaObject@@B @ 4385 NONAME ; struct QMetaObject const QHistoryState::staticMetaObject + ?QBasicAtomicPointer_isFetchAndAddNative@@YA_NXZ @ 4386 NONAME ; bool QBasicAtomicPointer_isFetchAndAddNative(void) + ?QBasicAtomicPointer_isFetchAndStoreNative@@YA_NXZ @ 4387 NONAME ; bool QBasicAtomicPointer_isFetchAndStoreNative(void) + ?QBasicAtomicPointer_isTestAndSetNative@@YA_NXZ @ 4388 NONAME ; bool QBasicAtomicPointer_isTestAndSetNative(void) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index 17693ea..99be68e 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -3612,4 +3612,11 @@ EXPORTS _ZNK13QStateMachine10isAnimatedEv @ 3611 NONAME _ZNK18QAbstractAnimation15currentLoopTimeEv @ 3612 NONAME _ZNK7QRegExp12captureCountEv @ 3613 NONAME + _Z38QBasicAtomicPointer_isTestAndSetNativev @ 3614 NONAME + _Z39QBasicAtomicPointer_isFetchAndAddNativev @ 3615 NONAME + _Z41QBasicAtomicPointer_isFetchAndStoreNativev @ 3616 NONAME + _ZN15QBasicAtomicInt18isTestAndSetNativeEv @ 3617 NONAME + _ZN15QBasicAtomicInt19isFetchAndAddNativeEv @ 3618 NONAME + _ZN15QBasicAtomicInt21isFetchAndStoreNativeEv @ 3619 NONAME + _ZN15QBasicAtomicInt25isReferenceCountingNativeEv @ 3620 NONAME |