diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 14:32:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 14:32:58 (GMT) |
| commit | 74d391adfd907d80ae35abe25fe346b2b4d649f9 (patch) | |
| tree | 9f7738ca66f06d010085453900b265b16c7427fa /src/gui/styles | |
| parent | 19a57f4e192267523fb815246b347bbc2054b736 (diff) | |
| parent | 6d5309c2fbdbf15948b430de103f393c5af5b7cd (diff) | |
| download | Qt-74d391adfd907d80ae35abe25fe346b2b4d649f9.zip Qt-74d391adfd907d80ae35abe25fe346b2b4d649f9.tar.gz Qt-74d391adfd907d80ae35abe25fe346b2b4d649f9.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:
Added support for unsigned smart installer package creation in Symbian
Fix QApplication::desktop()->availableGeometry() for Symbian
QS60Style: Possible NULL pointer use when drawing frame
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index bafc5f3..3a01f3f 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2001,7 +2001,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, case CE_ShapedFrame: if (const QTextEdit *textEdit = qobject_cast<const QTextEdit *>(widget)) { const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(option); - if (QS60StylePrivate::canDrawThemeBackground(frame->palette.base(), widget)) + if (frame && QS60StylePrivate::canDrawThemeBackground(frame->palette.base(), widget)) QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_Editor, painter, option->rect, flags); else QCommonStyle::drawControl(element, option, painter, widget); |