summaryrefslogtreecommitdiffstats
path: root/src/s60installs/eabi
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-05 23:10:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-05 23:10:19 (GMT)
commita8ff8e81f7b120e1ecdd434093be075cdd92fb24 (patch)
tree22c16865fb60eff0a7d60bdef96f81bc6b871674 /src/s60installs/eabi
parent1f682526eba54d47deddfac38c37a2bf6e26be66 (diff)
parentbd1aeaa50c60cffa3e195f3f6aed808f23a5c73c (diff)
downloadQt-a8ff8e81f7b120e1ecdd434093be075cdd92fb24.zip
Qt-a8ff8e81f7b120e1ecdd434093be075cdd92fb24.tar.gz
Qt-a8ff8e81f7b120e1ecdd434093be075cdd92fb24.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove the memory tracking attempt from the runtime graphics system.
Diffstat (limited to 'src/s60installs/eabi')
-rw-r--r--src/s60installs/eabi/QtGuiu.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index a22b4d9..d8e86bf 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12046,7 +12046,7 @@ EXPORTS
_ZN18QRuntimePixmapDataD1Ev @ 12045 NONAME
_ZN18QRuntimePixmapDataD2Ev @ 12046 NONAME
_ZN7QPixmap15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12047 NONAME
- _ZNK18QRuntimePixmapData11memoryUsageEv @ 12048 NONAME
+ _ZNK18QRuntimePixmapData11memoryUsageEv @ 12048 NONAME ABSENT
_ZNK18QRuntimePixmapData11paintEngineEv @ 12049 NONAME
_ZNK18QRuntimePixmapData11runtimeDataEv @ 12050 NONAME
_ZNK18QRuntimePixmapData11transformedERK10QTransformN2Qt18TransformationModeE @ 12051 NONAME