Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
3e9ded43
Commit
3e9ded43
authored
Apr 16, 2009
by
dt
Browse files
Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1
parents
8f78e79b
08759787
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/coreplugin/editormanager/editormanager.cpp
View file @
3e9ded43
...
...
@@ -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
View file @
3e9ded43
...
...
@@ -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
View file @
3e9ded43
...
...
@@ -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
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment