diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-10 11:34:36 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-10 11:34:36 (GMT) |
| commit | 09884750f89a24b6f480b4519b3a2a1b4c2f028d (patch) | |
| tree | 4942e6708e7f6401cb6620a75c275fc8578cc9d7 /src | |
| parent | bc7a42be16c5218ba5022c95bf1334a15a9151a6 (diff) | |
| parent | bfc32c590d797599ddfb814f023e5837c663ec23 (diff) | |
| download | Qt-09884750f89a24b6f480b4519b3a2a1b4c2f028d.zip Qt-09884750f89a24b6f480b4519b3a2a1b4c2f028d.tar.gz Qt-09884750f89a24b6f480b4519b3a2a1b4c2f028d.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src')
| -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) { |