From 897ea412c32a207bee16bc5a103b512d7c7c2880 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 4 Jun 2013 10:53:03 +0200 Subject: DiffEditor: Fix context lines spin box layout. Work around a regression in Qt 5 (QTBUG-31538) Also prefer setting left+right margins instead of all margins for the label. Change-Id: I108de101239145295d37002aa989a959d8041c55 Reviewed-by: Jarek Kobus --- src/plugins/diffeditor/diffeditor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/diffeditor/diffeditor.cpp') diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 3c89434bc9..381339e2f3 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -144,13 +144,14 @@ QWidget *DiffEditor::toolBar() QLabel *contextLabel = new QLabel(m_toolWidget); contextLabel->setText(tr("Context Lines:")); - contextLabel->setMargin(6); + contextLabel->setContentsMargins(6, 0, 6, 0); m_toolWidget->addWidget(contextLabel); QSpinBox *contextSpinBox = new QSpinBox(m_toolWidget); contextSpinBox->setRange(-1, 100); contextSpinBox->setValue(3); contextSpinBox->setFrame(false); + contextSpinBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding); // Mac Qt5 connect(contextSpinBox, SIGNAL(valueChanged(int)), m_editorWidget, SLOT(setContextLinesNumber(int))); m_toolWidget->addWidget(contextSpinBox); -- cgit v1.2.1