diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-10 17:43:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-10 17:43:13 +0200 |
| commit | 8ba384a5645aebbefe34b814828024d511171497 (patch) | |
| tree | 6f6cfe1b849b6e0e02de15ee74ad0f3d5fc740b6 /src/gui/text | |
| parent | e694ced803589b3504b6bdb2fc8bf97bc891c794 (diff) | |
| parent | 25b72a63fffe800f2005b21d254b0b191d263b10 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1a63523de158757964b6fb5ea026cf69a6c5ddcf
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index cdfcdec80c..ca569e5961 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -2801,6 +2801,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script) req.fallBackFamilies.clear(); } + Q_ASSERT(fe); if (fe->symbol || (d->request.styleStrategy & QFont::NoFontMerging)) { for (int i = 0; i < QChar::ScriptCount; ++i) { if (!d->engineData->engines[i]) { |