diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:28:09 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:28:09 (GMT) |
| commit | 650353f402d725688821b83904fe6319c8afa4da (patch) | |
| tree | 943c251676fe006e723e991bd126c002bcbb7bbd /src/gui/widgets/qpushbutton_p.h | |
| parent | 4a82d7cc185bd98ec8183fb0ccadefd3196b3ee2 (diff) | |
| parent | 754d9c2f1d0dce16017b99f766c1fa3e47b0afde (diff) | |
| download | Qt-650353f402d725688821b83904fe6319c8afa4da.zip Qt-650353f402d725688821b83904fe6319c8afa4da.tar.gz Qt-650353f402d725688821b83904fe6319c8afa4da.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtwebkit-4.6-staging
Conflicts:
util/webkit/mkdist-webkit
Diffstat (limited to 'src/gui/widgets/qpushbutton_p.h')
| -rw-r--r-- | src/gui/widgets/qpushbutton_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qpushbutton_p.h b/src/gui/widgets/qpushbutton_p.h index 0c5ac79..9d682d8 100644 --- a/src/gui/widgets/qpushbutton_p.h +++ b/src/gui/widgets/qpushbutton_p.h @@ -65,7 +65,7 @@ public: QPushButtonPrivate() : QAbstractButtonPrivate(QSizePolicy::PushButton), autoDefault(Auto), - defaultButton(false), flat(false), menuOpen(false) {} + defaultButton(false), flat(false), menuOpen(false), lastAutoDefault(false) {} inline void init() { resetLayoutItemMargins(); } void resetLayoutItemMargins(); @@ -77,6 +77,7 @@ public: uint defaultButton : 1; uint flat : 1; uint menuOpen : 1; + mutable uint lastAutoDefault : 1; }; QT_END_NAMESPACE |