diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 23:18:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 23:18:00 (GMT) |
| commit | fcdf5a5471b7cf1d2bc72855ed1f627c8d6f4fc4 (patch) | |
| tree | 9859d21d69c2d510f86316ff9ef3bd3da4972be0 /src/plugins | |
| parent | d50278c22bf748691719abfd2837f96deabda033 (diff) | |
| parent | 2ecb0ea77c04424f6f557ca8a13c1d86666763df (diff) | |
| download | Qt-fcdf5a5471b7cf1d2bc72855ed1f627c8d6f4fc4.zip Qt-fcdf5a5471b7cf1d2bc72855ed1f627c8d6f4fc4.tar.gz Qt-fcdf5a5471b7cf1d2bc72855ed1f627c8d6f4fc4.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 for major regression in OpenVG clipping
Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4.
Don't use EGL surfaces for translucency with 32MB GPU chip.
Fix for fromSymbianCFbsBitmap changing the source data unexpectedly.
Background app visible after split view closed
Get the number of cores from HAL on Symbian.
Avoid image conversion in fromSymbianCFbsBitmap for certain formats.
Polish splitview implementation
QML app: text input field is not visible when split view is opened
Visible flashing on QML app when split view is opened and closed
Diffstat (limited to 'src/plugins')
| -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); } |