diff options
| author | Richard Moore <rich@kde.org> | 2012-02-19 16:52:24 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 00:07:31 +0100 |
| commit | 5f5f9f33be4f21cdf925482898042bb792d53a78 (patch) | |
| tree | 96d51ccc25c2f8e1c815a1676fb4524749361a02 /src/widgets/widgets/qmenu.h | |
| parent | e8ecf3ad034c759be753a625ac97800df53cb401 (diff) | |
Merge overloads.
Fixes a Qt 5 TODO
Change-Id: Ide3159a5b979bd8e8a1edefff7fccb98dbe9a78e
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qmenu.h')
| -rw-r--r-- | src/widgets/widgets/qmenu.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 182b0bc2b8..1fa7195170 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -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; |