diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
| commit | 02e0523fe2b1dfd08eadaf127023306f6aa64c6f (patch) | |
| tree | 26f374407ac0976e69f092517d69e1c93332492c /src/gui/styles/qmacstyle_mac.mm | |
| parent | d501b04974df3615ac12fa93e11e893a44fbe715 (diff) | |
| parent | c7a18308a2725e4d1763777cb549f1ae74848005 (diff) | |
| download | Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.zip Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.gz Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.bz2 | |
Merge commit 'remotes/origin/4.7' into qt47s2
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.mm')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index ae90d26..671a888 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -1440,6 +1440,9 @@ QMacStylePrivate::QMacStylePrivate(QMacStyle *style) bool QMacStylePrivate::animatable(QMacStylePrivate::Animates as, const QWidget *w) const { + if (!w) + return false; + if (as == AquaPushButton) { QPushButton *pb = const_cast<QPushButton *>(static_cast<const QPushButton *>(w)); if (w->window()->isActiveWindow() && pb && !mouseDown) { |