diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-05 02:12:31 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-05 02:12:31 (GMT) |
| commit | 5a98d58c1ed78262c20b05aa178a92b4a1a097df (patch) | |
| tree | 00c8c459c2bdbf438a35e5087250319d4766fe29 /src/gui/widgets/qpushbutton.cpp | |
| parent | 7de5f19f0f62f181132394da6d7b2c8484cd42d9 (diff) | |
| parent | 5749421fdaff0305d217712e3174c85a76b367c4 (diff) | |
| download | Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.zip Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.tar.gz Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/widgets/qpushbutton.cpp')
| -rw-r--r-- | src/gui/widgets/qpushbutton.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp index 8a18ed0..237c266 100644 --- a/src/gui/widgets/qpushbutton.cpp +++ b/src/gui/widgets/qpushbutton.cpp @@ -687,11 +687,11 @@ bool QPushButton::event(QEvent *e) /*! \reimp */ bool QPushButton::hitButton(const QPoint &pos) const { - // This is only required if we are using the native style, so check that first. - QMacStyle *macStyle = qobject_cast<QMacStyle *>(style()); - // If this is a flat button we just bail out. - if(isFlat() || (0 == macStyle)) + QStyleOptionButton opt; + initStyleOption(&opt); + if (qt_mac_buttonIsRenderedFlat(this, &opt)) return QAbstractButton::hitButton(pos); + // Now that we know we are using the native style, let's proceed. Q_D(const QPushButton); QPushButtonPrivate *nonConst = const_cast<QPushButtonPrivate *>(d); |