diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 11:25:28 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 11:25:28 (GMT) |
commit | f11568e805def983af96b6e697094df1fb96af15 (patch) | |
tree | d24f32e1ba3935e0455de80acc8c4eb9a078a70e | |
parent | 9096d43e6a6e1bf88174268366adebb8b07b6895 (diff) | |
parent | 50846a87e82fa94753bd369d03c9ba00108a12de (diff) | |
download | Qt-f11568e805def983af96b6e697094df1fb96af15.zip Qt-f11568e805def983af96b6e697094df1fb96af15.tar.gz Qt-f11568e805def983af96b6e697094df1fb96af15.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:
Allow TLW translucency on Symbian without Qt::FramelessWindowHint
-rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 86b858d..46f3254 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -738,9 +738,6 @@ void QWidgetPrivate::s60UpdateIsOpaque() if (!q->testAttribute(Qt::WA_WState_Created) || !q->testAttribute(Qt::WA_TranslucentBackground)) return; - if ((data.window_flags & Qt::FramelessWindowHint) == 0) - return; - RWindow *const window = static_cast<RWindow *>(q->effectiveWinId()->DrawableWindow()); #ifdef Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE |