diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
commit | 388fe97f2a54089544dff0ed3af6ca70bf604716 (patch) | |
tree | 163b47974c625849726804337bd667c942dfbc77 /src/3rdparty | |
parent | a0c4b6f34546bdd22167a76a0540d37e9a37c0cf (diff) | |
parent | 591116490cf313808e8ba05ddd066656a1d1a566 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I81dbf90fc936c9bf08197baefa071117bddb1c63
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/wasm/DejaVuSansMono.ttf | bin | 0 -> 237788 bytes | |||
-rw-r--r-- | src/3rdparty/wasm/qt_attribution.json | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/wasm/DejaVuSansMono.ttf b/src/3rdparty/wasm/DejaVuSansMono.ttf Binary files differnew file mode 100644 index 0000000000..029fcac35f --- /dev/null +++ b/src/3rdparty/wasm/DejaVuSansMono.ttf diff --git a/src/3rdparty/wasm/qt_attribution.json b/src/3rdparty/wasm/qt_attribution.json index d569fdc167..75c5c6c49f 100644 --- a/src/3rdparty/wasm/qt_attribution.json +++ b/src/3rdparty/wasm/qt_attribution.json @@ -20,7 +20,7 @@ "Name": "DejaVu Fonts", "QDocModule": "qtgui", "QtUsage": "Used for WebAssembly platform.", - "Files": "DejaVuSans.ttf", + "Files": "DejaVuSans.ttf, DejaVuSansMono.ttf", "Description": "The DejaVu fonts are a font family based on the Vera Fonts.", "Homepage": "https://dejavu-fonts.github.io/", |