diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-06 07:31:33 (GMT) |
---|---|---|
committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-06 07:31:33 (GMT) |
commit | 1dfad8d85a5586831225168c20b1d87efea82522 (patch) | |
tree | c611d57de3f651a943ed9d5d3335cb5fa913f91c /src/s60installs/eabi/QtGuiu.def | |
parent | 4bc408c6faade543c76fa0c7b8841ce72c239688 (diff) | |
parent | e1ff574c9c37a955d5a0e398c0dc217363f38489 (diff) | |
download | Qt-1dfad8d85a5586831225168c20b1d87efea82522.zip Qt-1dfad8d85a5586831225168c20b1d87efea82522.tar.gz Qt-1dfad8d85a5586831225168c20b1d87efea82522.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/s60installs/eabi/QtGuiu.def')
-rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 2 |
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 |