diff options
author | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
---|---|---|
committer | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
commit | 5b1a07e9ccf0a5139273b447e2b2fda6564a506a (patch) | |
tree | 6ad6fc7836747044713ade6e75d7230b848ba46e /tools/designer/src/lib/shared/actionrepository.cpp | |
parent | 0186faea383f3f8223bffd1844e5a47ca22770a5 (diff) | |
parent | ea0f526ac3a7daef5d4ebff2373a01d4088e28c3 (diff) | |
download | Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.zip Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.gz Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/designer/src/lib/shared/actionrepository.cpp')
-rw-r--r-- | tools/designer/src/lib/shared/actionrepository.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/designer/src/lib/shared/actionrepository.cpp b/tools/designer/src/lib/shared/actionrepository.cpp index 854a2b5..1655d07 100644 --- a/tools/designer/src/lib/shared/actionrepository.cpp +++ b/tools/designer/src/lib/shared/actionrepository.cpp @@ -504,10 +504,10 @@ ActionView::ActionView(QWidget *parent) : addWidget(m_actionListView); addWidget(m_actionTreeView); // Wire signals - connect(m_actionTreeView, SIGNAL(contextMenuRequested(QContextMenuEvent*, QAction*)), - this, SIGNAL(contextMenuRequested(QContextMenuEvent*, QAction*))); - connect(m_actionListView, SIGNAL(contextMenuRequested(QContextMenuEvent*, QAction*)), - this, SIGNAL(contextMenuRequested(QContextMenuEvent*, QAction*))); + connect(m_actionTreeView, SIGNAL(contextMenuRequested(QContextMenuEvent*,QAction*)), + this, SIGNAL(contextMenuRequested(QContextMenuEvent*,QAction*))); + connect(m_actionListView, SIGNAL(contextMenuRequested(QContextMenuEvent*,QAction*)), + this, SIGNAL(contextMenuRequested(QContextMenuEvent*,QAction*))); // make it possible for vs integration to reimplement edit action dialog // [which it shouldn't do actually] |