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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
This commit is contained in:
Eike Ziller
2012-09-27 20:38:57 +02:00
parent a299252ae5 14a2ff598a
commit 6faede0860
156 changed files with 705 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -2096,7 +2096,12 @@ QChar BaseTextEditorWidget::characterAt(int pos) const
bool BaseTextEditorWidget::event(QEvent *e)
{
#if QT_VERSION >= 0x050000
if (e->type() != QEvent::InputMethodQuery)
d->m_contentsChanged = false;
#else
d->m_contentsChanged = false;
#endif
switch (e->type()) {
case QEvent::ShortcutOverride:
if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape && d->m_snippetOverlay->isVisible()) {