summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-10-06 07:23:27 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-06 07:23:27 (GMT)
commit231d8d7c02161e93b3a97a1bacb3c402f16e1fcb (patch)
treef738be172f3a9296b1f9af582178090d78cc942c /src
parent771f2d93ba063591343578b6cdb3c18a6a09c49c (diff)
downloadQt-231d8d7c02161e93b3a97a1bacb3c402f16e1fcb.zip
Qt-231d8d7c02161e93b3a97a1bacb3c402f16e1fcb.tar.gz
Qt-231d8d7c02161e93b3a97a1bacb3c402f16e1fcb.tar.bz2
Q3PopupMenu constructor failed to call setObjectName
Task-number: QTBUG-1087 Reviewed-by: Andreas
Diffstat (limited to 'src')
-rw-r--r--src/qt3support/widgets/q3popupmenu.h14
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; }