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

doc/qtcreator.qdoc

@@ -157,21 +157,19 @@
 
     \section1 Session Management in Qt Creator
 
-    ### screenshot
-
     In Qt Creator, a session is a collection of loaded projects, opened files,
     editor settings, and so on. When you run Qt Creator, you have a default
     session. You can create a new session using the \gui{Session Manager...},
     available in the \gui{File -> Session} menu.
 
+    \image qtcreator-session-menu.png
+
+
     To switch between sessions, select \gui{File -> Session}. If you do not
     create and select any session, Qt Creator will always use the default
     session.
 
-\omit
+    \image qtcreator-session-manager.png
-    session management can also store project dependencies, thorbjorn is
-    currently working on it
-\endomit
 
 
     \section1 Qt Help Integration

src/plugins/coreplugin/editormanager/stackededitorgroup.cpp

@@ -79,6 +79,7 @@ StackedEditorGroup::StackedEditorGroup(QWidget *parent) :
     tl->setMargin(0);
     {
         m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        m_editorList->setSizeAdjustPolicy(QComboBox::AdjustToContents);
         m_editorList->setMinimumContentsLength(20);
         m_proxyModel.setSourceModel(model());
         m_proxyModel.sort(0);