Merge remote-tracking branch 'origin/5.11' into 5.12

* origin/5.11:
  ce4d383 Do not enable HighDpiScaling on emulator
  a061521 Fix ebike-demo font issues

Change-Id: I5c48bb1e1567fd9e6eb04aa662c4b667e5b6219e

11 files changed, 25 insertions, 1 deletions

diff --git a/fonts.qrc b/fonts.qrc
index 45a8161..51030a9 100644
--- a/fonts.qrc
+++ b/fonts.qrc
@@ -11,5 +11,14 @@
         <file>qml/fonts/TitilliumWeb-Regular.ttf</file>
         <file>qml/fonts/TitilliumWeb-SemiBold.ttf</file>
         <file>qml/fonts/TitilliumWeb-SemiBoldItalic.ttf</file>
+        <file>qml/fonts/fontawesome-webfont.ttf</file>
+        <file>qml/fonts/Montserrat-Bold.ttf</file>
+        <file>qml/fonts/Montserrat-Light.ttf</file>
+        <file>qml/fonts/Montserrat-Medium.ttf</file>
+        <file>qml/fonts/Montserrat-Regular.ttf</file>
+        <file>qml/fonts/Teko-Bold.ttf</file>
+        <file>qml/fonts/Teko-Light.ttf</file>
+        <file>qml/fonts/Teko-Medium.ttf</file>
+        <file>qml/fonts/Teko-Regular.ttf</file>
     </qresource>
 </RCC>
diff --git a/qml/fonts/Montserrat-Bold.ttf b/qml/fonts/Montserrat-Bold.ttf
new file mode 100644
index 0000000..8e9a5f3
--- /dev/null
+++ b/qml/fonts/Montserrat-Bold.ttf
diff --git a/qml/fonts/Montserrat-Light.ttf b/qml/fonts/Montserrat-Light.ttf
new file mode 100644
index 0000000..e66dc5b
--- /dev/null
+++ b/qml/fonts/Montserrat-Light.ttf
diff --git a/qml/fonts/Montserrat-Medium.ttf b/qml/fonts/Montserrat-Medium.ttf
new file mode 100644
index 0000000..88d70b8
--- /dev/null
+++ b/qml/fonts/Montserrat-Medium.ttf
diff --git a/qml/fonts/Montserrat-Regular.ttf b/qml/fonts/Montserrat-Regular.ttf
new file mode 100644
index 0000000..626355a
--- /dev/null
+++ b/qml/fonts/Montserrat-Regular.ttf
diff --git a/qml/fonts/Teko-Bold.ttf b/qml/fonts/Teko-Bold.ttf
new file mode 100644
index 0000000..d061824
--- /dev/null
+++ b/qml/fonts/Teko-Bold.ttf
diff --git a/qml/fonts/Teko-Light.ttf b/qml/fonts/Teko-Light.ttf
new file mode 100644
index 0000000..ec5194a
--- /dev/null
+++ b/qml/fonts/Teko-Light.ttf
diff --git a/qml/fonts/Teko-Medium.ttf b/qml/fonts/Teko-Medium.ttf
new file mode 100644
index 0000000..cc38086
--- /dev/null
+++ b/qml/fonts/Teko-Medium.ttf
diff --git a/qml/fonts/Teko-Regular.ttf b/qml/fonts/Teko-Regular.ttf
new file mode 100644
index 0000000..3161e63
--- /dev/null
+++ b/qml/fonts/Teko-Regular.ttf
diff --git a/qml/fonts/fontawesome-webfont.ttf b/qml/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..35acda2
--- /dev/null
+++ b/qml/fonts/fontawesome-webfont.ttf
diff --git a/src/main.cpp b/src/main.cpp
index 249f5a1..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);
@@ -91,6 +95,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()) {