Merge remote-tracking branch 'origin/4.12'

Conflicts:
	src/plugins/cmakeprojectmanager/fileapiparser.cpp

Change-Id: I39f8c2be859be043f506bef77de9bb5b42d38165

src/libs/qmljs/parser/qmljslexer.cpp

@@ -877,12 +877,13 @@ int Lexer::scanString(ScanStringMode mode)
     // in case we just parsed a \r, we need to reset this flag to get things working
     // correctly in the loop below and afterwards
     _skipLinefeed = false;
-
+    bool first = true;
     if (_engine) {
         while (_codePtr <= _endPtr) {
             if (isLineTerminator()) {
                 if ((quote == QLatin1Char('`') || qmlMode())) {
-                    --_currentLineNumber;
+                    if (first)
+                        --_currentLineNumber;
                     break;
                 }
                 _errorCode = IllegalCharacter;
@@ -910,6 +911,7 @@ int Lexer::scanString(ScanStringMode mode)
             // don't use scanChar() here, that would transform \r sequences and the midRef() call would create the wrong result
             _char = *_codePtr++;
             ++_currentColumnNumber;
+            first = false;
         }
     }