diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-25 13:36:27 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-25 13:36:27 (GMT) |
| commit | bbd2a1b1d2e940a4051ffffc54a2d0d81f1e5e0c (patch) | |
| tree | 92cad439bb6d5038f6ebb99b35e37639b9a33252 /src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp | |
| parent | 7cc93f1390d5436017ce690394388aa3e78e7986 (diff) | |
| parent | a4b3fb256c25ce7b6e8b9fd162ee11ae4338fa76 (diff) | |
| download | Qt-bbd2a1b1d2e940a4051ffffc54a2d0d81f1e5e0c.zip Qt-bbd2a1b1d2e940a4051ffffc54a2d0d81f1e5e0c.tar.gz Qt-bbd2a1b1d2e940a4051ffffc54a2d0d81f1e5e0c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp')
| -rw-r--r-- | src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp index 1da58e1..4b4f677 100644 --- a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp +++ b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp @@ -43,7 +43,7 @@ #include <QtOpenVG/private/qpixmapdata_vg_p.h> #include <QtOpenVG/private/qwindowsurface_vg_p.h> #include <QtOpenVG/private/qvgimagepool_p.h> -#if defined(Q_OS_SYMBIAN) && !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE) +#if defined(Q_OS_SYMBIAN) #include <QtGui/private/qwidget_p.h> #endif #include <QtGui/private/qapplication_p.h> @@ -70,10 +70,12 @@ QPixmapData *QVGGraphicsSystem::createPixmapData(QPixmapData::PixelType type) co QWindowSurface *QVGGraphicsSystem::createWindowSurface(QWidget *widget) const { -#if defined(Q_OS_SYMBIAN) && !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE) - QWidgetPrivate *d = qt_widget_private(widget); - if (!d->isOpaque && widget->testAttribute(Qt::WA_TranslucentBackground)) - return d->createDefaultWindowSurface_sys(); +#if defined(Q_OS_SYMBIAN) + if (!QApplicationPrivate::instance()->useTranslucentEGLSurfaces) { + QWidgetPrivate *d = qt_widget_private(widget); + if (!d->isOpaque && widget->testAttribute(Qt::WA_TranslucentBackground)) + return d->createDefaultWindowSurface_sys(); + } #endif return new QVGWindowSurface(widget); } |