aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArmin Berres <armin.berres@basyskom.de>2010-12-09 14:08:14 +0100
committerArmin Berres <armin.berres@basyskom.de>2010-12-09 17:30:37 +0100
commit51d394d2f25a83db648dc1d1c3abe1cea7442958 (patch)
tree911552d0b5c7ac91ae355b00e70b5df117631fd0 /src
parent5b71322e01af5346f02f32971d92943ee6b9d633 (diff)
Fixes: NB#207113 - mixing transparent and non-transparent windows is not possible with meego graphicssystem
RevBy: Michael Dominic K. Details: MeeGo graphicssystem is checking for the Qt::WA_TranslucentBackground attribute now. The QMeeGoGraphicsSystemHelper::setTranslucent() API is deprecated and should not be used anymore.
Diffstat (limited to 'src')
-rw-r--r--src/corelib/core/mgraphicssystemhelper.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/core/mgraphicssystemhelper.cpp b/src/corelib/core/mgraphicssystemhelper.cpp
index a09a4374..5f29e9dc 100644
--- a/src/corelib/core/mgraphicssystemhelper.cpp
+++ b/src/corelib/core/mgraphicssystemhelper.cpp
@@ -126,16 +126,12 @@ void MGraphicsSystemHelper::switchToSoftwareRendering(MWindow *window)
#ifdef QT_OPENGL_LIB
void MGraphicsSystemHelper::switchToHardwareRendering(MWindow *window, QGLContext **glContext)
{
- bool translucent = window->testAttribute(Qt::WA_TranslucentBackground);
#ifdef HAVE_MEEGOGRAPHICSSYSTEM
if (QMeeGoGraphicsSystemHelper::runningGraphicsSystemName() != QLatin1String("native")) {
mDebug("MGraphicsSystemHelper") << "hardware rendering with meego enabled";
if (!QMeeGoGraphicsSystemHelper::isRunningMeeGo()) {
QMeeGoGraphicsSystemHelper::switchToMeeGo();
}
- if (translucent) {
- QMeeGoGraphicsSystemHelper::setTranslucent(true);
- }
*glContext = const_cast<QGLContext*>(QGLContext::currentContext());
} else
#endif // HAVE_MEEGOGRAPHICSSYSTEM
@@ -149,6 +145,7 @@ void MGraphicsSystemHelper::switchToHardwareRendering(MWindow *window, QGLContex
// a crash.
// This QGLWidget is owned by the viewport so previous one
// actually gets deleted if we overwrite it with a new one
+ bool translucent = window->testAttribute(Qt::WA_TranslucentBackground);
if (translucent) {
QGLFormat fmt;
// disable multisampling, is enabled by default in Qt