diff options
| author | Jason Barron <jason.barron@nokia.com> | 2010-08-04 14:09:04 (GMT) |
|---|---|---|
| committer | Jason Barron <jason.barron@nokia.com> | 2010-08-05 12:59:11 (GMT) |
| commit | bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c (patch) | |
| tree | 1557f755f7817da48f11080bf2964838f9e688aa /src/s60installs | |
| parent | e5071275f719ec36ff5e14b1e92258f270ef22b6 (diff) | |
| download | Qt-bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c.zip Qt-bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c.tar.gz Qt-bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c.tar.bz2 | |
Remove the memory tracking attempt from the runtime graphics system.
It has been decided that this logic will not be used by anyone at the
moment so let's remove it. This removes an exported (although private)
virtual function so breaks binary compatiblity for plugins built with
previous versions.
Reviewed-by: Jani Hautakangas
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 2 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 7844688..90c0878 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12832,7 +12832,7 @@ EXPORTS ?readBackInfo@QRuntimePixmapData@@QAEXXZ @ 12831 NONAME ; void QRuntimePixmapData::readBackInfo(void) ??_EQRuntimePixmapData@@UAE@I@Z @ 12832 NONAME ; QRuntimePixmapData::~QRuntimePixmapData(unsigned int) ?paintEngine@QRuntimePixmapData@@UBEPAVQPaintEngine@@XZ @ 12833 NONAME ; class QPaintEngine * QRuntimePixmapData::paintEngine(void) const - ?memoryUsage@QRuntimePixmapData@@UBEIXZ @ 12834 NONAME ; unsigned int QRuntimePixmapData::memoryUsage(void) const + ?memoryUsage@QRuntimePixmapData@@UBEIXZ @ 12834 NONAME ABSENT ; unsigned int QRuntimePixmapData::memoryUsage(void) const ?toImage@QRasterPixmapData@@UBE?AVQImage@@ABVQRect@@@Z @ 12835 NONAME ; class QImage QRasterPixmapData::toImage(class QRect const &) const ?fromImageReader@QRasterPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12836 NONAME ; void QRasterPixmapData::fromImageReader(class QImageReader *, class QFlags<enum Qt::ImageConversionFlag>) ?fill@QRuntimePixmapData@@UAEXABVQColor@@@Z @ 12837 NONAME ; void QRuntimePixmapData::fill(class QColor const &) 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 |