From 5dfe7b5fedf1f9a41ee97f62503e6802b8d7c05d Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sun, 30 Mar 2014 15:16:30 +0300 Subject: Drop dead code The QFontEngineMulti's `base` font engine always non-null. Change-Id: I5092b66bc839a6a3216ffa0b0afe55a8b62be620 Reviewed-by: Lars Knoll --- src/gui/text/qrawfont.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index 2ba350fb67..f789ec596b 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -700,10 +700,7 @@ QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writ if (fe != 0 && fe->type() == QFontEngine::Multi) { QFontEngineMulti *multiEngine = static_cast(fe); fe = multiEngine->engine(0); - if (fe == 0) { - multiEngine->loadEngine(0); - fe = multiEngine->engine(0); - } + Q_ASSERT(fe); } if (fe != 0) { -- cgit v1.2.3