feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
This commit is contained in:
Oswald Buddenhagen
2014-08-05 14:24:23 +02:00
parent 59b34b6b53 b2ac3fd90c
commit f3a61e8bf7
239 changed files with 3370 additions and 2107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -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)),