aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt
diff options
context:
space:
mode:
authormitchell <unknown>2020-01-05 17:10:23 -0500
committermitchell <unknown>2020-01-05 17:10:23 -0500
commitca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 (patch)
treea2469638126f8a958ad6e86b6ee6b2b7eedaf036 /qt
parent51c270affe753fcfae24887ee940e8061c631d7d (diff)
downloadscintilla-mirror-ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601.tar.gz
Synchronizing LongTerm3 with default.
Ideally this covers anything missed during the backport process.
Diffstat (limited to 'qt')
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp4
1 files changed, 2 insertions, 2 deletions
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)