diff options
Diffstat (limited to 'basicsuite/shared')
| -rw-r--r-- | basicsuite/shared/fonts.qrc | 14 | ||||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf | bin | 0 -> 191648 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf | bin | 0 -> 192116 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf | bin | 0 -> 192488 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf | bin | 0 -> 190648 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf | bin | 0 -> 305800 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf | bin | 0 -> 301528 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf | bin | 0 -> 310028 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf | bin | 0 -> 311780 bytes | |||
| -rw-r--r-- | basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf | bin | 0 -> 165548 bytes | |||
| -rw-r--r-- | basicsuite/shared/main.cpp | 18 | ||||
| -rw-r--r-- | basicsuite/shared/shared.pri | 14 |
12 files changed, 27 insertions, 19 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> diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf Binary files differnew file mode 100644 index 0000000..8e9a5f3 --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf Binary files differnew file mode 100644 index 0000000..e66dc5b --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf Binary files differnew file mode 100644 index 0000000..88d70b8 --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf Binary files differnew file mode 100644 index 0000000..626355a --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf Binary files differnew file mode 100644 index 0000000..d061824 --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf Binary files differnew file mode 100644 index 0000000..ec5194a --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf Binary files differnew file mode 100644 index 0000000..cc38086 --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf Binary files differnew file mode 100644 index 0000000..3161e63 --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf b/basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf Binary files differnew file mode 100644 index 0000000..35acda2 --- /dev/null +++ b/basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index 4afbbe4..d22ea8a 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -95,15 +95,15 @@ int main(int argc, char **argv) QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Black.ttf"); //For eBike demo - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Bold.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Light.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Medium.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Regular.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Bold.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Light.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Medium.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Regular.ttf"); - QFontDatabase::addApplicationFont(":/fonts/fontawesome-webfont.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Light.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Medium.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Light.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Medium.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/fontawesome-webfont.ttf"); QString path = app.applicationDirPath(); diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index 223bb02..50772d0 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -28,15 +28,19 @@ defineTest(b2qtdemo_deploy_defaults) { DISTFILES += $$PWD/fonts/TitilliumWeb-Black.ttf \ $$PWD/fonts/TitilliumWeb-Bold.ttf \ - $$PWD/fonts/TitilliumWeb-BoldItalic.ttf \ $$PWD/fonts/TitilliumWeb-ExtraLight.ttf \ - $$PWD/fonts/TitilliumWeb-ExtraLightItalic.ttf \ - $$PWD/fonts/TitilliumWeb-Italic.ttf \ $$PWD/fonts/TitilliumWeb-Light.ttf \ - $$PWD/fonts/TitilliumWeb-LightItalic.ttf \ $$PWD/fonts/TitilliumWeb-Regular.ttf \ $$PWD/fonts/TitilliumWeb-SemiBold.ttf \ - $$PWD/fonts/TitilliumWeb-SemiBoldItalic.ttf + $$PWD/fonts/ebike-fonts/fontawesome-webfont.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Bold.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Light.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Medium.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Regular.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Bold.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Light.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Medium.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Regular.ttf RESOURCES += \ $$PWD/fonts.qrc |