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
Tobias Hunger
qt-creator
Commits
6ae2cc0b
Commit
6ae2cc0b
authored
Dec 10, 2008
by
hjk
Browse files
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
parents
15412127
e9d90710
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/projectwindow.cpp
View file @
6ae2cc0b
...
...
@@ -45,6 +45,7 @@
#include
<coreplugin/icore.h>
#include
<QtCore/QDebug>
#include
<QtGui/QApplication>
#include
<QtGui/QBoxLayout>
#include
<QtGui/QComboBox>
#include
<QtGui/QTabWidget>
...
...
@@ -190,7 +191,14 @@ void ProjectWindow::updateTreeWidget()
// That one runs fully thorough and deletes all widgets, even that one that we are currently removing
// from m_panelsTabWidget.
// To prevent that, we simply prevent the focus switching....
m_treeWidget
->
setFocus
();
QWidget
*
focusWidget
=
qApp
->
focusWidget
();
while
(
focusWidget
)
{
if
(
focusWidget
==
this
)
{
m_treeWidget
->
setFocus
();
break
;
}
focusWidget
=
focusWidget
->
parentWidget
();
}
m_treeWidget
->
clear
();
foreach
(
Project
*
project
,
m_session
->
projects
())
{
...
...
src/plugins/projectexplorer/session.cpp
View file @
6ae2cc0b
...
...
@@ -628,8 +628,10 @@ bool SessionManager::loadImpl(const QString &fileName)
if
(
success
)
{
// restore the active mode
const
QString
&
modeIdentifier
=
value
(
QLatin1String
(
"ActiveMode"
)).
toString
();
if
(
!
modeIdentifier
.
isEmpty
())
if
(
!
modeIdentifier
.
isEmpty
())
{
m_core
->
modeManager
()
->
activateMode
(
modeIdentifier
);
m_core
->
modeManager
()
->
setFocusToCurrentMode
();
}
}
if
(
debug
)
...
...
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