From 655d39a9d7968502620231170019a439451f8066 Mon Sep 17 00:00:00 2001
From: mae <qt-info@nokia.com>
Date: Thu, 16 Apr 2009 11:22:18 +0200
Subject: [PATCH 1/3] nicer visual session switching

---
 src/plugins/coreplugin/editormanager/editormanager.cpp | 1 +
 src/plugins/coreplugin/editormanager/editormanager.h   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index f9b2cde57b2..7edd516cafe 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/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;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index fa4b05740e7..81a1025a4ee 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/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();

From 1356d8c20a753e4fd66cdefc0e63fd6d7d8da585 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 16 Apr 2009 15:34:06 +0200
Subject: [PATCH 2/3] whoops

newlines are like whitespace, so items don't run together
---
 src/shared/proparser/profileevaluator.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 1313f7c0306..0aea2bcbc07 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -346,6 +346,7 @@ bool ProFileEvaluator::Private::parseLine(const QString &line0)
     m_contNextLine = escaped;
     if (escaped) {
         m_proitem.chop(1);
+        updateItem();
         return true;
     } else {
         if (!m_syntaxError) {

From 923db1ce6d99c73fdce402f80840226dbf21b08b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 16 Apr 2009 15:35:54 +0200
Subject: [PATCH 3/3] less convoluted

---
 src/shared/proparser/profileevaluator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 0aea2bcbc07..95bd578d9fc 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -351,10 +351,10 @@ bool ProFileEvaluator::Private::parseLine(const QString &line0)
     } else {
         if (!m_syntaxError) {
             updateItem();
-            if (!m_contNextLine)
-                finalizeBlock();
+            finalizeBlock();
+            return true;
         }
-        return !m_syntaxError;
+        return false;
     }
 }