diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-19 16:35:06 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-19 16:35:06 (GMT) |
| commit | 901b0391d15ab72830fcfd73048eeff03fb9ed07 (patch) | |
| tree | cf5f2f2eab83301bf08952426f25eb54a90e9ac4 /tools/designer/src/lib/shared/actioneditor.cpp | |
| parent | bb4e301ce6762ab300618c579bd65ea1ee17dc2d (diff) | |
| parent | 34044853d4315309920a481a585f96ba7b3fb140 (diff) | |
| download | Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.zip Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.tar.gz Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'tools/designer/src/lib/shared/actioneditor.cpp')
| -rw-r--r-- | tools/designer/src/lib/shared/actioneditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/designer/src/lib/shared/actioneditor.cpp b/tools/designer/src/lib/shared/actioneditor.cpp index 56bd353..8d416c9 100644 --- a/tools/designer/src/lib/shared/actioneditor.cpp +++ b/tools/designer/src/lib/shared/actioneditor.cpp @@ -234,8 +234,8 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent, connect(m_actionView,SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(slotSelectionChanged(QItemSelection,QItemSelection))); - connect(m_actionView, SIGNAL(contextMenuRequested(QContextMenuEvent*, QAction*)), - this, SLOT(slotContextMenuRequested(QContextMenuEvent*, QAction*))); + connect(m_actionView, SIGNAL(contextMenuRequested(QContextMenuEvent*,QAction*)), + this, SLOT(slotContextMenuRequested(QContextMenuEvent*,QAction*))); connect(this, SIGNAL(itemActivated(QAction*)), this, SLOT(editAction(QAction*))); |