diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 13:49:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 13:49:25 (GMT) |
| commit | 4d1c8407c1ac16b6288c3aa0f7c2118d2748f348 (patch) | |
| tree | 39dba13ead381333e49238933633cb2459bb449c /src/gui/kernel/qwidget.cpp | |
| parent | 26b07492710de0551bb21d7fd1e7767d5093cf7d (diff) | |
| parent | 8e87feefc0a92fbbeb1846f2471cdded9ef901ff (diff) | |
| download | Qt-4d1c8407c1ac16b6288c3aa0f7c2118d2748f348.zip Qt-4d1c8407c1ac16b6288c3aa0f7c2118d2748f348.tar.gz Qt-4d1c8407c1ac16b6288c3aa0f7c2118d2748f348.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Move avkon component transparency check to app initialization.
Fix for symbian dialog background transparency.
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 81a9a80..ede87de 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -2026,6 +2026,14 @@ void QWidgetPrivate::updateIsOpaque() } #endif +#ifdef Q_WS_S60 + if (q->windowType() == Qt::Dialog && q->testAttribute(Qt::WA_TranslucentBackground) + && S60->avkonComponentsSupportTransparency) { + setOpaque(false); + return; + } +#endif + if (q->testAttribute(Qt::WA_OpaquePaintEvent) || q->testAttribute(Qt::WA_PaintOnScreen)) { setOpaque(true); return; |