Merge commit 'origin/1.1'

Conflicts:
	src/plugins/debugger/debuggeractions.cpp
	src/plugins/debugger/gdboptionpage.ui

src/shared/proparser/profileevaluator.cpp

@@ -346,14 +346,15 @@ bool ProFileEvaluator::Private::parseLine(const QString &line0)
     m_contNextLine = escaped;
     if (escaped) {
         m_proitem.chop(1);
+        updateItem();
         return true;
     } else {
         if (!m_syntaxError) {
             updateItem();
-            if (!m_contNextLine)
-                finalizeBlock();
+            finalizeBlock();
+            return true;
         }
-        return !m_syntaxError;
+        return false;
     }
 }