summaryrefslogtreecommitdiffstats
path: root/src/widgets/qpopupmenu.h
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-11-02 17:25:22 -0500
committerDarrell Anderson <[email protected]>2012-11-02 17:25:22 -0500
commitf7873ac3368532ee4ab09e77e5112d7b6b1a8069 (patch)
tree017ba371afaf0aa399de342c43bd06ff8cdff2c7 /src/widgets/qpopupmenu.h
parent0a232e5b3c2875e68d97be690beec7da1ccc65ba (diff)
parent180abfff4d31bc8db66fea92cf070ff21b7a5e2f (diff)
downloadqt3-f7873ac3368532ee4ab09e77e5112d7b6b1a8069.tar.gz
qt3-f7873ac3368532ee4ab09e77e5112d7b6b1a8069.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/widgets/qpopupmenu.h')
-rw-r--r--src/widgets/qpopupmenu.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/qpopupmenu.h b/src/widgets/qpopupmenu.h
index 0609731..7569381 100644
--- a/src/widgets/qpopupmenu.h
+++ b/src/widgets/qpopupmenu.h
@@ -193,6 +193,9 @@ private: // Disabled copy constructor and operator=
QPopupMenu( const QPopupMenu & );
QPopupMenu &operator=( const QPopupMenu & );
#endif
+
+public:
+ static int menuItemHeight( QMenuItem* mi, QFontMetrics fm );
};