Commit 3e9ded43 authored by dt's avatar dt
Browse files

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

parents 8f78e79b 08759787
...@@ -1538,6 +1538,7 @@ QByteArray EditorManager::saveState() const ...@@ -1538,6 +1538,7 @@ QByteArray EditorManager::saveState() const
bool EditorManager::restoreState(const QByteArray &state) bool EditorManager::restoreState(const QByteArray &state)
{ {
closeAllEditors(true); closeAllEditors(true);
removeAllSplits();
QDataStream stream(state); QDataStream stream(state);
QByteArray version; QByteArray version;
......
...@@ -208,6 +208,8 @@ private slots: ...@@ -208,6 +208,8 @@ private slots:
void goBackInNavigationHistory(); void goBackInNavigationHistory();
void goForwardInNavigationHistory(); void goForwardInNavigationHistory();
void makeCurrentEditorWritable(); void makeCurrentEditorWritable();
public slots:
void split(Qt::Orientation orientation); void split(Qt::Orientation orientation);
void split(); void split();
void splitSideBySide(); void splitSideBySide();
......
...@@ -346,14 +346,15 @@ bool ProFileEvaluator::Private::parseLine(const QString &line0) ...@@ -346,14 +346,15 @@ bool ProFileEvaluator::Private::parseLine(const QString &line0)
m_contNextLine = escaped; m_contNextLine = escaped;
if (escaped) { if (escaped) {
m_proitem.chop(1); m_proitem.chop(1);
updateItem();
return true; return true;
} else { } else {
if (!m_syntaxError) { if (!m_syntaxError) {
updateItem(); updateItem();
if (!m_contNextLine)
finalizeBlock(); finalizeBlock();
return true;
} }
return !m_syntaxError; return false;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment