Merge commit 'origin/1.2'

2009-06-16 14:58:28 +02:00
parent 7594cc5a41 aa2836f1dc
commit 4f4f767b2b
19 changed files with 18612 additions and 4846 deletions
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -380,7 +380,8 @@ void CPPEditor::createToolBar(CPPEditorEditable *editable)

    QToolBar *toolBar = editable->toolBar();
    QList<QAction*> actions = toolBar->actions();
-    toolBar->insertWidget(actions.first(), m_methodCombo);
+    QWidget *w = toolBar->widgetForAction(actions.first());
+    static_cast<QHBoxLayout*>(w->layout())->insertWidget(0, m_methodCombo, 1);
 }

 int CPPEditor::previousBlockState(QTextBlock block) const