diff options
| author | Juho Annunen <juho.annunen@qt.io> | 2018-08-30 11:42:42 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-08-31 06:57:02 +0000 |
| commit | a06152127bf4d1f9ee09f2938568be146238d9e4 (patch) | |
| tree | ff20b9ff000dc6e91eedd5e5d2fc87e5536c6636 | |
| parent | 5d8d87f96559a577bb72d2eb02a3ed798c480948 (diff) | |
Fix ebike-demo font issues
Task-number: QTBUG-69840
Change-Id: I795c5e0d2e1be19cd285f89893bb13da03cc98e7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | fonts.qrc | 9 | ||||
| -rw-r--r-- | qml/fonts/Montserrat-Bold.ttf | bin | 0 -> 191648 bytes | |||
| -rw-r--r-- | qml/fonts/Montserrat-Light.ttf | bin | 0 -> 192116 bytes | |||
| -rw-r--r-- | qml/fonts/Montserrat-Medium.ttf | bin | 0 -> 192488 bytes | |||
| -rw-r--r-- | qml/fonts/Montserrat-Regular.ttf | bin | 0 -> 190648 bytes | |||
| -rw-r--r-- | qml/fonts/Teko-Bold.ttf | bin | 0 -> 305800 bytes | |||
| -rw-r--r-- | qml/fonts/Teko-Light.ttf | bin | 0 -> 301528 bytes | |||
| -rw-r--r-- | qml/fonts/Teko-Medium.ttf | bin | 0 -> 310028 bytes | |||
| -rw-r--r-- | qml/fonts/Teko-Regular.ttf | bin | 0 -> 311780 bytes | |||
| -rw-r--r-- | qml/fonts/fontawesome-webfont.ttf | bin | 0 -> 165548 bytes | |||
| -rw-r--r-- | src/main.cpp | 11 |
11 files changed, 20 insertions, 0 deletions
@@ -11,5 +11,14 @@ <file>qml/fonts/TitilliumWeb-Regular.ttf</file> <file>qml/fonts/TitilliumWeb-SemiBold.ttf</file> <file>qml/fonts/TitilliumWeb-SemiBoldItalic.ttf</file> + <file>qml/fonts/fontawesome-webfont.ttf</file> + <file>qml/fonts/Montserrat-Bold.ttf</file> + <file>qml/fonts/Montserrat-Light.ttf</file> + <file>qml/fonts/Montserrat-Medium.ttf</file> + <file>qml/fonts/Montserrat-Regular.ttf</file> + <file>qml/fonts/Teko-Bold.ttf</file> + <file>qml/fonts/Teko-Light.ttf</file> + <file>qml/fonts/Teko-Medium.ttf</file> + <file>qml/fonts/Teko-Regular.ttf</file> </qresource> </RCC> diff --git a/qml/fonts/Montserrat-Bold.ttf b/qml/fonts/Montserrat-Bold.ttf Binary files differnew file mode 100644 index 0000000..8e9a5f3 --- /dev/null +++ b/qml/fonts/Montserrat-Bold.ttf diff --git a/qml/fonts/Montserrat-Light.ttf b/qml/fonts/Montserrat-Light.ttf Binary files differnew file mode 100644 index 0000000..e66dc5b --- /dev/null +++ b/qml/fonts/Montserrat-Light.ttf diff --git a/qml/fonts/Montserrat-Medium.ttf b/qml/fonts/Montserrat-Medium.ttf Binary files differnew file mode 100644 index 0000000..88d70b8 --- /dev/null +++ b/qml/fonts/Montserrat-Medium.ttf diff --git a/qml/fonts/Montserrat-Regular.ttf b/qml/fonts/Montserrat-Regular.ttf Binary files differnew file mode 100644 index 0000000..626355a --- /dev/null +++ b/qml/fonts/Montserrat-Regular.ttf diff --git a/qml/fonts/Teko-Bold.ttf b/qml/fonts/Teko-Bold.ttf Binary files differnew file mode 100644 index 0000000..d061824 --- /dev/null +++ b/qml/fonts/Teko-Bold.ttf diff --git a/qml/fonts/Teko-Light.ttf b/qml/fonts/Teko-Light.ttf Binary files differnew file mode 100644 index 0000000..ec5194a --- /dev/null +++ b/qml/fonts/Teko-Light.ttf diff --git a/qml/fonts/Teko-Medium.ttf b/qml/fonts/Teko-Medium.ttf Binary files differnew file mode 100644 index 0000000..cc38086 --- /dev/null +++ b/qml/fonts/Teko-Medium.ttf diff --git a/qml/fonts/Teko-Regular.ttf b/qml/fonts/Teko-Regular.ttf Binary files differnew file mode 100644 index 0000000..3161e63 --- /dev/null +++ b/qml/fonts/Teko-Regular.ttf diff --git a/qml/fonts/fontawesome-webfont.ttf b/qml/fonts/fontawesome-webfont.ttf Binary files differnew file mode 100644 index 0000000..35acda2 --- /dev/null +++ b/qml/fonts/fontawesome-webfont.ttf diff --git a/src/main.cpp b/src/main.cpp index 249f5a1..2f744cc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -91,6 +91,17 @@ int main(int argc, char **argv) QFontDatabase::addApplicationFont(":/qml/fonts/TitilliumWeb-Bold.ttf"); QFontDatabase::addApplicationFont(":/qml/fonts/TitilliumWeb-Black.ttf"); + //For eBike demo + QFontDatabase::addApplicationFont(":/qml/fonts/Montserrat-Bold.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/Montserrat-Light.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/Montserrat-Medium.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/Montserrat-Regular.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/Teko-Bold.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/Teko-Light.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/Teko-Medium.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/Teko-Regular.ttf"); + QFontDatabase::addApplicationFont(":/qml/fonts/fontawesome-webfont.ttf"); + ApplicationSettings applicationSettings; if (!applicationSettings.parseCommandLineArguments()) { |