summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qpushbutton_p.h
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-12-09 23:07:52 (GMT)
committerBill King <bill.king@nokia.com>2009-12-09 23:07:52 (GMT)
commite032c0756df0d11f7a43bcdfbb82cf2d83fe74a4 (patch)
tree36884ee5c9a9287663c05d5db529a3a0f16b9550 /src/gui/widgets/qpushbutton_p.h
parent127d52df97b68fcf54a50e471a0b899d92fda10a (diff)
parent346d3618bad19714b41ad45715cdef9488ce8969 (diff)
downloadQt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.zip
Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.tar.gz
Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/widgets/qpushbutton_p.h')
-rw-r--r--src/gui/widgets/qpushbutton_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/qpushbutton_p.h b/src/gui/widgets/qpushbutton_p.h
index f448027..2510e05 100644
--- a/src/gui/widgets/qpushbutton_p.h
+++ b/src/gui/widgets/qpushbutton_p.h
@@ -68,6 +68,10 @@ public:
defaultButton(false), flat(false), menuOpen(false), lastAutoDefault(false) {}
inline void init() { resetLayoutItemMargins(); }
+ static QPushButtonPrivate* get(QPushButton *b) { return b->d_func(); }
+#ifndef QT_NO_MENU
+ QPoint adjustedMenuPosition();
+#endif
void resetLayoutItemMargins();
void _q_popupPressed();
QDialog *dialogParent() const;