diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 14:50:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 14:50:47 (GMT) |
| commit | 150df2037f392225771f94b39f7a340d7c154de7 (patch) | |
| tree | 7eaf54f025cf670d00e7bd96c4021435d2da709c /src | |
| parent | bfa6ac28c57d62f9add7fa27f029eac7f3835fab (diff) | |
| parent | 708fcbe457304ac8035c20302e6dc6628a0f6aa4 (diff) | |
| download | Qt-150df2037f392225771f94b39f7a340d7c154de7.zip Qt-150df2037f392225771f94b39f7a340d7c154de7.tar.gz Qt-150df2037f392225771f94b39f7a340d7c154de7.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 rounded corners bug in QMenu
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 2f4bb4b..d573ebf 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -82,6 +82,10 @@ # include <private/qt_cocoa_helpers_mac_p.h> #endif +#ifdef Q_WS_S60 +# include "private/qt_s60_p.h" +#endif + QT_BEGIN_NAMESPACE @@ -172,6 +176,14 @@ void QMenuPrivate::init() q->addAction(selectAction); q->addAction(cancelAction); #endif + +#ifdef Q_WS_S60 + if (S60->avkonComponentsSupportTransparency) { + bool noSystemBackground = q->testAttribute(Qt::WA_NoSystemBackground); + q->setAttribute(Qt::WA_TranslucentBackground); // also sets WA_NoSystemBackground + q->setAttribute(Qt::WA_NoSystemBackground, noSystemBackground); // restore system background attribute + } +#endif } int QMenuPrivate::scrollerHeight() const |