diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-06 07:23:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-07 02:13:49 (GMT) |
| commit | 4838b5fc16cb6060c808021f62af27ec2180781b (patch) | |
| tree | 99a022b2daaeefc42cb3237e2f2dc74bad13ad95 | |
| parent | d8a781f278691c64a9bdad47480bf38603f3128a (diff) | |
| download | Qt-4838b5fc16cb6060c808021f62af27ec2180781b.zip Qt-4838b5fc16cb6060c808021f62af27ec2180781b.tar.gz Qt-4838b5fc16cb6060c808021f62af27ec2180781b.tar.bz2 | |
Q3PopupMenu constructor failed to call setObjectName
Task-number: QTBUG-1087
Reviewed-by: Andreas
(cherry picked from commit 231d8d7c02161e93b3a97a1bacb3c402f16e1fcb)
| -rw-r--r-- | src/qt3support/widgets/q3popupmenu.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qt3support/widgets/q3popupmenu.h b/src/qt3support/widgets/q3popupmenu.h index c8525bd..2af69d9 100644 --- a/src/qt3support/widgets/q3popupmenu.h +++ b/src/qt3support/widgets/q3popupmenu.h @@ -54,8 +54,8 @@ class Q_COMPAT_EXPORT Q3PopupMenu : public QMenu { Q_OBJECT public: - inline Q3PopupMenu(QWidget *parent = 0, const char * =0) : QMenu(parent) - { } + inline Q3PopupMenu(QWidget *parent = 0, const char *name = 0) : QMenu(parent) + { setObjectName(QLatin1String(name)); } inline int exec() { return findIdForAction(QMenu::exec()); } inline int exec(const QPoint & pos, int indexAtPoint = 0) { @@ -64,8 +64,8 @@ public: void setFrameRect(QRect) {} QRect frameRect() const { return QRect(); } - enum DummyFrame { Box, Sunken, Plain, Raised, MShadow, NoFrame, Panel, StyledPanel, - HLine, VLine, GroupBoxPanel, WinPanel, ToolBarPanel, MenuBarPanel, + enum DummyFrame { Box, Sunken, Plain, Raised, MShadow, NoFrame, Panel, StyledPanel, + HLine, VLine, GroupBoxPanel, WinPanel, ToolBarPanel, MenuBarPanel, PopupPanel, LineEditPanel, TabWidgetPanel, MShape }; void setFrameShadow(DummyFrame) {} DummyFrame frameShadow() const { return Plain; } @@ -75,10 +75,10 @@ public: int frameStyle() const { return 0; } int frameWidth() const { return 0; } void setLineWidth(int) {} - int lineWidth() const { return 0; } + int lineWidth() const { return 0; } void setMargin(int margin) { setContentsMargins(margin, margin, margin, margin); } - int margin() const - { int margin; int dummy; getContentsMargins(&margin, &dummy, &dummy, &dummy); return margin; } + int margin() const + { int margin; int dummy; getContentsMargins(&margin, &dummy, &dummy, &dummy); return margin; } void setMidLineWidth(int) {} int midLineWidth() const { return 0; } |