Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -1538,6 +1538,7 @@ QByteArray EditorManager::saveState() const
 bool EditorManager::restoreState(const QByteArray &state)
 {
     closeAllEditors(true);
+    removeAllSplits();
     QDataStream stream(state);
 
     QByteArray version;

src/plugins/coreplugin/editormanager/editormanager.h

@@ -208,6 +208,8 @@ private slots:
     void goBackInNavigationHistory();
     void goForwardInNavigationHistory();
     void makeCurrentEditorWritable();
+
+public slots:
     void split(Qt::Orientation orientation);
     void split();
     void splitSideBySide();

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;
     }
 }