summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-10 00:20:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-10 00:20:40 (GMT)
commit051fd1b23e4d7e45b8600571ab6b80afca6f62d9 (patch)
tree2cf3a90149165a5e68f510a31f378fe50ce1ad62
parenteec2c615443d02ea5d9b2407336218c55956151e (diff)
parenta7d685332372854177a0f152706927e069bee919 (diff)
downloadQt-051fd1b23e4d7e45b8600571ab6b80afca6f62d9.zip
Qt-051fd1b23e4d7e45b8600571ab6b80afca6f62d9.tar.gz
Qt-051fd1b23e4d7e45b8600571ab6b80afca6f62d9.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Refroze QtCore ARMV5 DEF files
-rw-r--r--src/s60installs/eabi/QtCoreu.def3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index 3f282de..cfdd9ee 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3806,4 +3806,7 @@ EXPORTS
_ZNK13QElapsedTimer12nsecsElapsedEv @ 3805 NONAME
_ZNK11QMetaMethod8revisionEv @ 3806 NONAME
_ZNK13QMetaProperty8revisionEv @ 3807 NONAME
+ _ZN16QAnimationDriverC1EP7QObject @ 3808 NONAME
+ _ZN16QAnimationDriverC1ER23QAnimationDriverPrivateP7QObject @ 3809 NONAME
+ _ZN31QNonContiguousByteDeviceFactory6createE14QSharedPointerI11QRingBufferE @ 3810 NONAME