diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2010-02-02 11:17:19 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-02-03 12:47:23 (GMT) |
| commit | cc7e15b415dc408b58e4451f7e07dcd469301a56 (patch) | |
| tree | 5fd1cf26ed2aa2a0e61fbd8cf07f71542c0b52f7 /src | |
| parent | 8bb967ef68cd6f3501c25ca4ad0c6396047c75df (diff) | |
| download | Qt-cc7e15b415dc408b58e4451f7e07dcd469301a56.zip Qt-cc7e15b415dc408b58e4451f7e07dcd469301a56.tar.gz Qt-cc7e15b415dc408b58e4451f7e07dcd469301a56.tar.bz2 | |
Fixed potential crash in mac style
(cherry picked from commit 7ced77b654eb46af1221a55e315795c1be1753a0)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index cf7f34d..d6b819b 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -2412,9 +2412,11 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW break; case PM_ToolBarFrameWidth: ret = 1; - if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(widget->parent())) - if (mainWindow->unifiedTitleAndToolBarOnMac()) - ret = 0; + if (widget) { + if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(widget->parent())) + if (mainWindow->unifiedTitleAndToolBarOnMac()) + ret = 0; + } break; default: ret = QWindowsStyle::pixelMetric(metric, opt, widget); |