diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:26 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:27 +0300 |
| commit | 0ab63b035a649dc1982c867cd37d466d249004b9 (patch) | |
| tree | 6de22edcd3957aae3eee698136a000e52ab7f8fe /src/gui/text/qrawfont.cpp | |
| parent | a6f8aa0ae1d5a1d1099df1891ea60b14b6eb6065 (diff) | |
| parent | 0cb2c760c219514849ab0f6be8e5368f92dfa5d9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
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) { |