summaryrefslogtreecommitdiffstats
path: root/basicsuite/shared/main.cpp
diff options
context:
space:
mode:
authorJuho Annunen <juho.annunen@qt.io>2018-08-20 12:25:40 +0300
committerJuho Annunen <juho.annunen@qt.io>2018-08-29 07:30:00 +0000
commit09aa32dd522176a9b9762e4d85b3e8c66d4d6be2 (patch)
tree06600dddeb2598e2745f21d52aad73b4ea456990 /basicsuite/shared/main.cpp
parent1ff81b46a37550bb4430cc032b6d5504525af53f (diff)
Fix some major scaling & font issues on ebike-demo
Task-number: QTBUG-69840 Change-Id: If519ae62a0a73c8dbf2f6f7b9f681bdfdb8b28a0 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'basicsuite/shared/main.cpp')
-rw-r--r--basicsuite/shared/main.cpp18
1 files changed, 9 insertions, 9 deletions
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();