diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-04 10:53:03 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-06-04 11:24:51 +0200 |
| commit | 897ea412c32a207bee16bc5a103b512d7c7c2880 (patch) | |
| tree | 53adf9501b7830e50b2ed7de8e566d29453441b3 /src/plugins/diffeditor/diffeditor.cpp | |
| parent | aa0533c969841f530977e89ee96e351d6f1f25eb (diff) | |
| download | qt-creator-897ea412c32a207bee16bc5a103b512d7c7c2880.tar.gz | |
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 <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); |