summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/diffeditor/sidebysidediffeditorwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 7a8501d8a7..cdaad44d0b 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -396,10 +396,10 @@ void SideDiffEditorWidget::paintSeparator(QPainter &painter,
const QString replacementText = " {" + foldReplacementText(block) + "}; ";
const int replacementTextWidth = fontMetrics().width(replacementText) + 24;
- int x = replacementTextWidth + offset.x();
+ int x = replacementTextWidth + int(offset.x());
if (x < document()->documentMargin()
|| !TextDocumentLayout::isFolded(block)) {
- x = document()->documentMargin();
+ x = int(document()->documentMargin());
}
const QString elidedText = fontMetrics().elidedText(text,
Qt::ElideRight,