Add new fonts

Task-number: QTBUG-65302
Change-Id: I9ec2e7f5f904aa148aa29048ccbb84060e1bb3f1
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

14 files changed, 37 insertions, 1 deletions

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 @@
+<RCC>
+    <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>
+    </qresource>
+</RCC>
diff --git a/basicsuite/shared/fonts/TitilliumWeb-Black.ttf b/basicsuite/shared/fonts/TitilliumWeb-Black.ttf
new file mode 100644
index 0000000..fc5c4b5
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-Black.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf b/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf
new file mode 100644
index 0000000..0af0fe7
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf
new file mode 100644
index 0000000..77425ea
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf b/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf
new file mode 100644
index 0000000..2b506ef
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf
new file mode 100644
index 0000000..c1be5ba
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf b/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf
new file mode 100644
index 0000000..42f2c10
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-Light.ttf b/basicsuite/shared/fonts/TitilliumWeb-Light.ttf
new file mode 100644
index 0000000..ca67971
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-Light.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf
new file mode 100644
index 0000000..2ea724f
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf b/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf
new file mode 100644
index 0000000..6da8219
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf b/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf
new file mode 100644
index 0000000..dfdcdbe
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf
diff --git a/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf
new file mode 100644
index 0000000..b68a669
--- /dev/null
+++ b/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf
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