diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-10 18:29:22 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-10 18:29:22 (GMT) |
commit | 1950c400294ac0006b20e8b411e896fc98e3b2bf (patch) | |
tree | 5a4dd4e0918db8be6ef385697e359dbb7eed0099 /src/plugins | |
parent | 9f926d7fd11da71d8948a64c4b9134a4c2c73fcd (diff) | |
parent | 36f43e454e772776f77401806b49115894963dfa (diff) | |
download | Qt-1950c400294ac0006b20e8b411e896fc98e3b2bf.zip Qt-1950c400294ac0006b20e8b411e896fc98e3b2bf.tar.gz Qt-1950c400294ac0006b20e8b411e896fc98e3b2bf.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:
Fix QtCoreu.def file error
Introduce platform extension to QGraphicsSystem
Update changes for 4.7.3
Show softkeys when opening a dialog that has a fullscreen parent.
QSslCertificate: report fraudulent certificates as invalid
QSslCertificate: fix test for blacklisted certs on Windows
QSslSocket internals: abort on encountering blacklisted certificates
QSslSocket: add test for blacklisted certificates
Changes for 4.7.3
Fix for wrong dpi metrics for raster pixmaps on Symbian.
Fix qgraphicstransform autotest for Symbian, where qreal is float.
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
QDeclarativeDebug: Export needed symbols on Symbian
Bump Qt version to 4.7.3
Fix QTBUG-17627: build break in mobility bearer applications
Fix for major regression in OpenVG clipping
Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp | 8 | ||||
-rw-r--r-- | src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp index 4b4f677..bf29dd4 100644 --- a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp +++ b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp @@ -80,9 +80,15 @@ QWindowSurface *QVGGraphicsSystem::createWindowSurface(QWidget *widget) const return new QVGWindowSurface(widget); } -void QVGGraphicsSystem::releaseCachedResources() +#ifdef Q_OS_SYMBIAN +void QVGGraphicsSystem::releaseCachedGpuResources() { QVGImagePool::instance()->hibernate(); } +QGraphicsSystemEx *QVGGraphicsSystem::platformExtension() +{ + return this; +} +#endif QT_END_NAMESPACE diff --git a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h index 9c9b3e2..feff451 100644 --- a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h +++ b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h @@ -55,9 +55,16 @@ #include <QtGui/private/qgraphicssystem_p.h> +#ifdef Q_OS_SYMBIAN +#include <QtGui/private/qgraphicssystemex_symbian_p.h> +#endif + QT_BEGIN_NAMESPACE class QVGGraphicsSystem : public QGraphicsSystem +#ifdef Q_OS_SYMBIAN + , public QSymbianGraphicsSystemEx +#endif { public: QVGGraphicsSystem(); @@ -65,7 +72,10 @@ public: QPixmapData *createPixmapData(QPixmapData::PixelType type) const; QWindowSurface *createWindowSurface(QWidget *widget) const; - void releaseCachedResources(); +#ifdef Q_OS_SYMBIAN + void releaseCachedGpuResources(); + QGraphicsSystemEx* platformExtension(); +#endif }; QT_END_NAMESPACE |