whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge overloads. 

Fixes a Qt 5 TODO

Change-Id: Ide3159a5b979bd8e8a1edefff7fccb98dbe9a78e
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
bb10
Richard Moore 2012-02-19 16:52:24 +00:00 committed by Qt by Nokia
parent e8ecf3ad03
commit 5f5f9f33be
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/widgets/widgets/qmenu.cpp
View File

@ -2082,31 +2082,6 @@ QAction *QMenu::exec(QList<QAction*> actions, const QPoint &pos, QAction *at, QW
return menu.exec(pos, at);
}
/*!
\overload
Executes a menu synchronously.
The menu's actions are specified by the list of \a actions. The menu
will pop up so that the specified action, \a at, appears at global
position \a pos. If \a at is not specified then the menu appears
at position \a pos.
The function returns the triggered QAction in either the popup
menu or one of its submenus, or 0 if no item was triggered
(normally because the user pressed Esc).
This is equivalent to:
\snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 6
\sa popup(), QWidget::mapToGlobal()
*/
QAction *QMenu::exec(QList<QAction*> actions, const QPoint &pos, QAction *at)
{
// ### Qt 5: merge
return exec(actions, pos, at, 0);
}
/*!
\reimp
*/

4
src/widgets/widgets/qmenu.h
View File

@ -116,9 +116,7 @@ public:
QAction *exec();
QAction *exec(const QPoint &pos, QAction *at=0);
// ### Qt 5: merge
static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at=0);
static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at, QWidget *parent);
static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at=0, QWidget *parent=0);
QSize sizeHint() const;