diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:27:27 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:27:27 +0100 |
| commit | d9a3e03934076aea8852f1c4b142a5ecfeea0297 (patch) | |
| tree | 6832178b5dddb8bf4dc61590265a638133f8bcfd /src/distancefieldgenerator | |
| parent | 4c0ba237eabf66e028459e86620c448c4e21760a (diff) | |
| parent | 64221433d7a82955b111e20178c9527cb0373914 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
Diffstat (limited to 'src/distancefieldgenerator')
| -rw-r--r-- | src/distancefieldgenerator/distancefieldmodel.cpp | 2 | ||||
| -rw-r--r-- | src/distancefieldgenerator/distancefieldmodel.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/distancefieldgenerator/distancefieldmodel.cpp b/src/distancefieldgenerator/distancefieldmodel.cpp index aebd86140..e529e65ba 100644 --- a/src/distancefieldgenerator/distancefieldmodel.cpp +++ b/src/distancefieldgenerator/distancefieldmodel.cpp @@ -183,7 +183,7 @@ void DistanceFieldModel::addDistanceField(const QImage &distanceField, if (ucs4 != 0) { UnicodeRange range = unicodeRangeForUcs4(ucs4); - m_glyphsPerUnicodeRange.insertMulti(range, glyphId); + m_glyphsPerUnicodeRange.insert(range, glyphId); m_glyphsPerUcs4.insert(ucs4, glyphId); } diff --git a/src/distancefieldgenerator/distancefieldmodel.h b/src/distancefieldgenerator/distancefieldmodel.h index b866e5e6a..5c71a20ab 100644 --- a/src/distancefieldgenerator/distancefieldmodel.h +++ b/src/distancefieldgenerator/distancefieldmodel.h @@ -31,6 +31,7 @@ #include <QAbstractListModel> #include <QRawFont> +#include <QtGui/qpainterpath.h> #include <QtGui/private/qtextengine_p.h> #include <QMultiHash> #include <QScopedPointer> |