diff options
| -rw-r--r-- | src/plugins/cppeditor/cppeditor.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/qtscripteditor/qtscripteditor.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 29b7f6cd11c..4491e71480f 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -275,7 +275,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 diff --git a/src/plugins/qtscripteditor/qtscripteditor.cpp b/src/plugins/qtscripteditor/qtscripteditor.cpp index 16244140235..47f7386ba75 100644 --- a/src/plugins/qtscripteditor/qtscripteditor.cpp +++ b/src/plugins/qtscripteditor/qtscripteditor.cpp @@ -52,8 +52,9 @@ #include <QtCore/QTimer> #include <QtCore/QtDebug> -#include <QtGui/QMenu> #include <QtGui/QComboBox> +#include <QtGui/QHBoxLayout> +#include <QtGui/QMenu> enum { UPDATE_DOCUMENT_DEFAULT_INTERVAL = 100 @@ -386,7 +387,8 @@ void ScriptEditor::createToolBar(ScriptEditorEditable *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); } void ScriptEditor::contextMenuEvent(QContextMenuEvent *e) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index c5e8703df4f..6b7f51194f1 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -4096,6 +4096,7 @@ BaseTextEditorEditable::BaseTextEditorEditable(BaseTextEditor *editor) QWidget *w = new QWidget; l->setMargin(0); l->setContentsMargins(5, 0, 5, 0); + l->addStretch(0); l->addWidget(m_cursorPositionLabel); w->setLayout(l); |