From 8e3fdf13543f43d7a4cb4fa41f7279f9a5d274d3 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Tue, 25 Nov 2014 15:37:40 +0400 Subject: Merge QFontEngineMultiBasicImpl and QFontEngineMulti MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Minor refactoring also improves the behavior and the code readability. Change-Id: Id89dd224f4132a4c0dfbc16f414ef42cc8d8a4da Reviewed-by: Tor Arne Vestbø --- src/gui/text/qplatformfontdatabase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/text/qplatformfontdatabase.cpp') diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index f18ddbab8a..d10cc8fed0 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -314,7 +314,7 @@ void QPlatformFontDatabase::invalidate() */ QFontEngineMulti *QPlatformFontDatabase::fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) { - return new QFontEngineMultiBasicImpl(fontEngine, script); + return new QFontEngineMulti(fontEngine, script); } /*! -- cgit v1.2.3