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

Merge remote-tracking branch 'origin/4.8' into 4.9

Browse Source 
Conflicts:
	src/plugins/android/androidrunnerworker.cpp
	src/plugins/android/androidrunnerworker.h

Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
This commit is contained in:
Eike Ziller
2019-02-04 15:21:55 +01:00
parent 7dba3f083c ffa14187a1
commit 88b29792cb
7 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljsautocompleter.cpp
View File

@@ -230,7 +230,7 @@ bool AutoCompleter::contextAllowsAutoQuotes(const QTextCursor &cursor,
}
// never insert ' into string literals, it adds spurious ' when writing contractions
if (textToInsert.at(0) == QLatin1Char('\''))
if (textToInsert.at(0) == QLatin1Char('\'') && quote != '\'')
return false;
if (textToInsert.at(0) != quote || isCompleteStringLiteral(tokenText))