Commit 117436a6 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

DiffEditor: Use explicit DirectConnection for context menu



The menu is expected to be populated after the signal is emitted.

Change-Id: Ibcb9eaf3742942801ad79b98000d48cb93d5ae31
Reviewed-by: default avatarJarek Kobus <jaroslaw.kobus@digia.com>
parent db5a4ac4
......@@ -779,7 +779,8 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
connect(m_leftEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)),
this, SLOT(slotLeftJumpToOriginalFileRequested(int,int,int)));
connect(m_leftEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)),
this, SLOT(slotLeftContextMenuRequested(QMenu*,int,int)));
this, SLOT(slotLeftContextMenuRequested(QMenu*,int,int)),
Qt::DirectConnection);
m_rightEditor = new SideDiffEditorWidget(this);
m_rightEditor->setReadOnly(true);
......@@ -791,7 +792,8 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
connect(m_rightEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)),
this, SLOT(slotRightJumpToOriginalFileRequested(int,int,int)));
connect(m_rightEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)),
this, SLOT(slotRightContextMenuRequested(QMenu*,int,int)));
this, SLOT(slotRightContextMenuRequested(QMenu*,int,int)),
Qt::DirectConnection);
connect(TextEditorSettings::instance(),
SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
......
......@@ -783,7 +783,7 @@ DiffEditor::DiffEditorDocument *GitClient::createDiffEditor(const QString &docum
VcsBasePlugin::setSource(diffEditorDocument, source);
connect(diffEditorDocument->controller(), SIGNAL(chunkActionsRequested(QMenu*,int,int)),
this, SLOT(slotChunkActionsRequested(QMenu*,int,int)));
this, SLOT(slotChunkActionsRequested(QMenu*,int,int)), Qt::DirectConnection);
return diffEditorDocument;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment