From ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 Mon Sep 17 00:00:00 2001 From: mitchell Date: Sun, 5 Jan 2020 17:10:23 -0500 Subject: Synchronizing LongTerm3 with default. Ideally this covers anything missed during the backport process. --- qt/ScintillaEditBase/PlatQt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qt/ScintillaEditBase/PlatQt.cpp') diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 281fdba3d..78f4e6eca 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -521,8 +521,8 @@ XYPOSITION SurfaceImpl::WidthText(Font &font, const char *s, int len) { QFontMetricsF metrics(*FontPointer(font), device); SetCodec(font); - QString string = codec->toUnicode(s, len); - return metrics.width(string); + QString su = codec->toUnicode(s, len); + return metrics.width(su); } XYPOSITION SurfaceImpl::Ascent(Font &font) -- cgit v1.2.3