From a06152127bf4d1f9ee09f2938568be146238d9e4 Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Thu, 30 Aug 2018 11:42:42 +0300 Subject: Fix ebike-demo font issues Task-number: QTBUG-69840 Change-Id: I795c5e0d2e1be19cd285f89893bb13da03cc98e7 Reviewed-by: Mikko Gronoff --- fonts.qrc | 9 +++++++++ qml/fonts/Montserrat-Bold.ttf | Bin 0 -> 191648 bytes qml/fonts/Montserrat-Light.ttf | Bin 0 -> 192116 bytes qml/fonts/Montserrat-Medium.ttf | Bin 0 -> 192488 bytes qml/fonts/Montserrat-Regular.ttf | Bin 0 -> 190648 bytes qml/fonts/Teko-Bold.ttf | Bin 0 -> 305800 bytes qml/fonts/Teko-Light.ttf | Bin 0 -> 301528 bytes qml/fonts/Teko-Medium.ttf | Bin 0 -> 310028 bytes qml/fonts/Teko-Regular.ttf | Bin 0 -> 311780 bytes qml/fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes src/main.cpp | 11 +++++++++++ 11 files changed, 20 insertions(+) create mode 100644 qml/fonts/Montserrat-Bold.ttf create mode 100644 qml/fonts/Montserrat-Light.ttf create mode 100644 qml/fonts/Montserrat-Medium.ttf create mode 100644 qml/fonts/Montserrat-Regular.ttf create mode 100644 qml/fonts/Teko-Bold.ttf create mode 100644 qml/fonts/Teko-Light.ttf create mode 100644 qml/fonts/Teko-Medium.ttf create mode 100644 qml/fonts/Teko-Regular.ttf create mode 100644 qml/fonts/fontawesome-webfont.ttf diff --git a/fonts.qrc b/fonts.qrc index 45a8161..51030a9 100644 --- a/fonts.qrc +++ b/fonts.qrc @@ -11,5 +11,14 @@ qml/fonts/TitilliumWeb-Regular.ttf qml/fonts/TitilliumWeb-SemiBold.ttf qml/fonts/TitilliumWeb-SemiBoldItalic.ttf + qml/fonts/fontawesome-webfont.ttf + qml/fonts/Montserrat-Bold.ttf + qml/fonts/Montserrat-Light.ttf + qml/fonts/Montserrat-Medium.ttf + qml/fonts/Montserrat-Regular.ttf + qml/fonts/Teko-Bold.ttf + qml/fonts/Teko-Light.ttf + qml/fonts/Teko-Medium.ttf + qml/fonts/Teko-Regular.ttf diff --git a/qml/fonts/Montserrat-Bold.ttf b/qml/fonts/Montserrat-Bold.ttf new file mode 100644 index 0000000..8e9a5f3 Binary files /dev/null and b/qml/fonts/Montserrat-Bold.ttf differ diff --git a/qml/fonts/Montserrat-Light.ttf b/qml/fonts/Montserrat-Light.ttf new file mode 100644 index 0000000..e66dc5b Binary files /dev/null and b/qml/fonts/Montserrat-Light.ttf differ diff --git a/qml/fonts/Montserrat-Medium.ttf b/qml/fonts/Montserrat-Medium.ttf new file mode 100644 index 0000000..88d70b8 Binary files /dev/null and b/qml/fonts/Montserrat-Medium.ttf differ diff --git a/qml/fonts/Montserrat-Regular.ttf b/qml/fonts/Montserrat-Regular.ttf new file mode 100644 index 0000000..626355a Binary files /dev/null and b/qml/fonts/Montserrat-Regular.ttf differ diff --git a/qml/fonts/Teko-Bold.ttf b/qml/fonts/Teko-Bold.ttf new file mode 100644 index 0000000..d061824 Binary files /dev/null and b/qml/fonts/Teko-Bold.ttf differ diff --git a/qml/fonts/Teko-Light.ttf b/qml/fonts/Teko-Light.ttf new file mode 100644 index 0000000..ec5194a Binary files /dev/null and b/qml/fonts/Teko-Light.ttf differ diff --git a/qml/fonts/Teko-Medium.ttf b/qml/fonts/Teko-Medium.ttf new file mode 100644 index 0000000..cc38086 Binary files /dev/null and b/qml/fonts/Teko-Medium.ttf differ diff --git a/qml/fonts/Teko-Regular.ttf b/qml/fonts/Teko-Regular.ttf new file mode 100644 index 0000000..3161e63 Binary files /dev/null and b/qml/fonts/Teko-Regular.ttf differ diff --git a/qml/fonts/fontawesome-webfont.ttf b/qml/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/qml/fonts/fontawesome-webfont.ttf differ 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()) { -- cgit v1.2.3 From ce4d3833f5193168fb61392d08f61e73997632eb Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 30 Aug 2018 20:58:52 +0300 Subject: Do not enable HighDpiScaling on emulator See QTBUG-64815. Change-Id: Id4a6f7059ef684393b05dfdb5c65740d129e6074 Reviewed-by: Sami Nurmenniemi --- src/main.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 2f744cc..2500a4a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -73,7 +73,11 @@ int main(int argc, char **argv) QIcon::setThemeSearchPaths(QStringList() << "/data/user/qt/qtquickcontrols2/icons"); QIcon::setThemeName("gallery"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + + // Do not set HighDpiScaling for emulator, see QTBUG-64815 + if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + } QApplication app(argc, argv); app.setApplicationVersion(APPLICATION_VERSION); -- cgit v1.2.3