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/gui/kernel/qapplication_s60.cpp | |
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/gui/kernel/qapplication_s60.cpp')
-rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index f8734b2..1f6a4ae 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1953,13 +1953,6 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent if (switchToSwRendering) { QRuntimeGraphicsSystem *gs = static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system); - - uint memoryUsage = gs->memoryUsage(); - uint memoryForFullscreen = ( S60->screenDepth / 8 ) - * S60->screenWidthInPixels - * S60->screenHeightInPixels; - - S60->memoryLimitForHwRendering = memoryUsage - memoryForFullscreen; gs->setGraphicsSystem(QLatin1String("raster")); } } @@ -1975,8 +1968,7 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent if(QApplicationPrivate::runtime_graphics_system) { QRuntimeGraphicsSystem *gs = static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system); - gs->setGraphicsSystem(QLatin1String("openvg"), S60->memoryLimitForHwRendering); - S60->memoryLimitForHwRendering = 0; + gs->setGraphicsSystem(QLatin1String("openvg")); } #endif break; |