diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-26 15:27:59 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-26 15:27:59 (GMT) |
| commit | 20ec83dc4c19436092262ab46615c19c9c8b20e7 (patch) | |
| tree | 928af012d381bc2ce37edf93a09346955184215d /src/gui/styles/qmacstyle_mac.mm | |
| parent | 3ca156558dad24f5ac0f9d0e35a558c5b8052c81 (diff) | |
| parent | 6bcf2ca6645409ffa1aaadd1bd302c6e86b5b028 (diff) | |
| download | Qt-20ec83dc4c19436092262ab46615c19c9c8b20e7.zip Qt-20ec83dc4c19436092262ab46615c19c9c8b20e7.tar.gz Qt-20ec83dc4c19436092262ab46615c19c9c8b20e7.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.mm')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 08d6fed..226b4d0 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -3888,13 +3888,16 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter } break; case CE_TabBarTabShape: - if (const QStyleOptionTabV3 *tabOpt = qstyleoption_cast<const QStyleOptionTabV3 *>(opt)) { - if (tabOpt->documentMode) { - p->save(); - QRect tabRect = tabOpt->rect; - drawTabShape(p, tabOpt); - p->restore(); - return; + if (const QStyleOptionTab *tabOpt = qstyleoption_cast<const QStyleOptionTab *>(opt)) { + + if (const QStyleOptionTabV3 *tabOptV3 = qstyleoption_cast<const QStyleOptionTabV3 *>(opt)) { + if (tabOptV3->documentMode) { + p->save(); + QRect tabRect = tabOptV3->rect; + drawTabShape(p, tabOptV3); + p->restore(); + return; + } } #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) |