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

src/plugins/cppeditor/cppeditor.cpp

@@ -196,6 +196,12 @@ void CPPEditor::createToolBar(CPPEditorEditable *editable)
     m_methodCombo = new QComboBox;
     m_methodCombo->setMinimumContentsLength(22);
     m_methodCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+
+    // Make the combo box prefer to expand
+    QSizePolicy policy = m_methodCombo->sizePolicy();
+    policy.setHorizontalPolicy(QSizePolicy::Expanding);
+    m_methodCombo->setSizePolicy(policy);
+
     QTreeView *methodView = new OverviewTreeView();
     methodView->header()->hide();
     methodView->setItemsExpandable(false);