From e365074240fe8ebc5b15c6ccc75cc969665fdd8d Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Tue, 17 Apr 2018 13:51:53 +0300 Subject: Add new fonts Task-number: QTBUG-65302 Change-Id: I9ec2e7f5f904aa148aa29048ccbb84060e1bb3f1 Reviewed-by: Sami Nurmenniemi Reviewed-by: Teemu Holappa --- basicsuite/shared/fonts.qrc | 15 +++++++++++++++ basicsuite/shared/fonts/TitilliumWeb-Black.ttf | Bin 0 -> 49356 bytes basicsuite/shared/fonts/TitilliumWeb-Bold.ttf | Bin 0 -> 59908 bytes basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf | Bin 0 -> 69796 bytes basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf | Bin 0 -> 63124 bytes .../shared/fonts/TitilliumWeb-ExtraLightItalic.ttf | Bin 0 -> 67788 bytes basicsuite/shared/fonts/TitilliumWeb-Italic.ttf | Bin 0 -> 72416 bytes basicsuite/shared/fonts/TitilliumWeb-Light.ttf | Bin 0 -> 64032 bytes basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf | Bin 0 -> 71720 bytes basicsuite/shared/fonts/TitilliumWeb-Regular.ttf | Bin 0 -> 63752 bytes basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf | Bin 0 -> 63044 bytes basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf | Bin 0 -> 71812 bytes basicsuite/shared/main.cpp | 8 +++++++- basicsuite/shared/shared.pri | 15 +++++++++++++++ 14 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 basicsuite/shared/fonts.qrc create mode 100644 basicsuite/shared/fonts/TitilliumWeb-Black.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-Bold.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-Italic.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-Light.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-Regular.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf create mode 100644 basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf diff --git a/basicsuite/shared/fonts.qrc b/basicsuite/shared/fonts.qrc new file mode 100644 index 0000000..13b8cb2 --- /dev/null +++ b/basicsuite/shared/fonts.qrc @@ -0,0 +1,15 @@ + + + fonts/TitilliumWeb-Black.ttf + fonts/TitilliumWeb-Bold.ttf + fonts/TitilliumWeb-BoldItalic.ttf + fonts/TitilliumWeb-ExtraLight.ttf + fonts/TitilliumWeb-ExtraLightItalic.ttf + fonts/TitilliumWeb-Italic.ttf + fonts/TitilliumWeb-Light.ttf + fonts/TitilliumWeb-LightItalic.ttf + fonts/TitilliumWeb-Regular.ttf + fonts/TitilliumWeb-SemiBold.ttf + fonts/TitilliumWeb-SemiBoldItalic.ttf + + diff --git a/basicsuite/shared/fonts/TitilliumWeb-Black.ttf b/basicsuite/shared/fonts/TitilliumWeb-Black.ttf new file mode 100644 index 0000000..fc5c4b5 Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-Black.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf b/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf new file mode 100644 index 0000000..0af0fe7 Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf new file mode 100644 index 0000000..77425ea Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf b/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf new file mode 100644 index 0000000..2b506ef Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf new file mode 100644 index 0000000..c1be5ba Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf b/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf new file mode 100644 index 0000000..42f2c10 Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-Light.ttf b/basicsuite/shared/fonts/TitilliumWeb-Light.ttf new file mode 100644 index 0000000..ca67971 Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-Light.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf new file mode 100644 index 0000000..2ea724f Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf b/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf new file mode 100644 index 0000000..6da8219 Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf b/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf new file mode 100644 index 0000000..dfdcdbe Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf differ diff --git a/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf new file mode 100644 index 0000000..b68a669 Binary files /dev/null and b/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf differ diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index 3c21bf5..4600236 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -76,7 +76,6 @@ int main(int argc, char **argv) QApplication app(argc, argv); - #if defined(USE_QTWEBENGINE) // This is currently needed by all QtWebEngine applications using the HW accelerated QQuickWebView. // It enables sharing the QOpenGLContext of all QQuickWindows of the application. @@ -84,6 +83,11 @@ int main(int argc, char **argv) QtWebEngine::initialize(); #endif + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-SemiBold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Black.ttf"); + QString path = app.applicationDirPath(); QPalette pal; @@ -117,7 +121,9 @@ int main(int argc, char **argv) DummyEngine engine; QQmlApplicationEngine applicationengine; + QString appFont("TitilliumWeb"); applicationengine.rootContext()->setContextProperty("engine", &engine); + applicationengine.rootContext()->setContextProperty("appFont", appFont); applicationengine.load(QUrl::fromLocalFile(path + "/SharedMain.qml")); app.exec(); diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index bc1c222..6105f78 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -25,3 +25,18 @@ defineTest(b2qtdemo_deploy_defaults) { export(OTHER_FILES) export(INSTALLS) } + +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 + +RESOURCES += \ + $$PWD/fonts.qrc -- cgit v1.2.3