diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:25:01 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:27:21 +0300 |
| commit | 97863a4992276a3d1aeb3c1bb9ef5a280a5e8b12 (patch) | |
| tree | b38f6f152e7036b91c25834a917e320955660db2 /basicsuite/shared/fonts.qrc | |
| parent | 8be609623fc646e8d9642fc8481a1b9e59fb8417 (diff) | |
| parent | aa8e21cc3f60e54dd9c5d1ec482ca440857568f0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
aa8e21c Add new Qt3D demo
ca03367 Exclude demos from colibri imx6ull
a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
d7e9731 do not enable highdpiscaling on emulator
f730907 Fix mediaplayer default video path
09aa32d Fix some major scaling & font issues on ebike-demo
Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb
Diffstat (limited to 'basicsuite/shared/fonts.qrc')
| -rw-r--r-- | basicsuite/shared/fonts.qrc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/basicsuite/shared/fonts.qrc b/basicsuite/shared/fonts.qrc index 13b8cb2..ccc8864 100644 --- a/basicsuite/shared/fonts.qrc +++ b/basicsuite/shared/fonts.qrc @@ -2,14 +2,18 @@ <qresource prefix="/"> <file>fonts/TitilliumWeb-Black.ttf</file> <file>fonts/TitilliumWeb-Bold.ttf</file> - <file>fonts/TitilliumWeb-BoldItalic.ttf</file> <file>fonts/TitilliumWeb-ExtraLight.ttf</file> - <file>fonts/TitilliumWeb-ExtraLightItalic.ttf</file> - <file>fonts/TitilliumWeb-Italic.ttf</file> <file>fonts/TitilliumWeb-Light.ttf</file> - <file>fonts/TitilliumWeb-LightItalic.ttf</file> <file>fonts/TitilliumWeb-Regular.ttf</file> <file>fonts/TitilliumWeb-SemiBold.ttf</file> - <file>fonts/TitilliumWeb-SemiBoldItalic.ttf</file> + <file>fonts/ebike-fonts/fontawesome-webfont.ttf</file> + <file>fonts/ebike-fonts/Montserrat-Bold.ttf</file> + <file>fonts/ebike-fonts/Montserrat-Light.ttf</file> + <file>fonts/ebike-fonts/Montserrat-Medium.ttf</file> + <file>fonts/ebike-fonts/Montserrat-Regular.ttf</file> + <file>fonts/ebike-fonts/Teko-Bold.ttf</file> + <file>fonts/ebike-fonts/Teko-Light.ttf</file> + <file>fonts/ebike-fonts/Teko-Medium.ttf</file> + <file>fonts/ebike-fonts/Teko-Regular.ttf</file> </qresource> </RCC> |