diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-03-30 15:16:30 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:27:24 +0200 |
| commit | 5dfe7b5fedf1f9a41ee97f62503e6802b8d7c05d (patch) | |
| tree | e5bae22183ca992f0ed88f2cc66a09d027a038b7 /src/gui/text/qrawfont.cpp | |
| parent | eccf1c51a68cce9f1642f66b594cf12b061dbc2b (diff) | |
Drop dead code
The QFontEngineMulti's `base` font engine always non-null.
Change-Id: I5092b66bc839a6a3216ffa0b0afe55a8b62be620
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/text/qrawfont.cpp')
| -rw-r--r-- | src/gui/text/qrawfont.cpp | 5 |
1 files changed, 1 insertions, 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<QFontEngineMulti *>(fe); fe = multiEngine->engine(0); - if (fe == 0) { - multiEngine->loadEngine(0); - fe = multiEngine->engine(0); - } + Q_ASSERT(fe); } if (fe != 0) { |