diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-07 12:47:28 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-07 12:48:06 +0300 |
commit | 3ac7e7975a7e70dc42558a83dd7a24baf1992c8b (patch) | |
tree | 5c023b92d76624da21c650cf81c14f7cabf96de5 | |
parent | 7e0230ac6b898df371f03bd136c5880e3a013966 (diff) | |
parent | ce4d3833f5193168fb61392d08f61e73997632eb (diff) |
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
-rw-r--r-- | fonts.qrc | 9 | ||||
-rw-r--r-- | qml/fonts/Montserrat-Bold.ttf | bin | 0 -> 191648 bytes | |||
-rw-r--r-- | qml/fonts/Montserrat-Light.ttf | bin | 0 -> 192116 bytes | |||
-rw-r--r-- | qml/fonts/Montserrat-Medium.ttf | bin | 0 -> 192488 bytes | |||
-rw-r--r-- | qml/fonts/Montserrat-Regular.ttf | bin | 0 -> 190648 bytes | |||
-rw-r--r-- | qml/fonts/Teko-Bold.ttf | bin | 0 -> 305800 bytes | |||
-rw-r--r-- | qml/fonts/Teko-Light.ttf | bin | 0 -> 301528 bytes | |||
-rw-r--r-- | qml/fonts/Teko-Medium.ttf | bin | 0 -> 310028 bytes | |||
-rw-r--r-- | qml/fonts/Teko-Regular.ttf | bin | 0 -> 311780 bytes | |||
-rw-r--r-- | qml/fonts/fontawesome-webfont.ttf | bin | 0 -> 165548 bytes | |||
-rw-r--r-- | src/main.cpp | 17 |
11 files changed, 25 insertions, 1 deletions
@@ -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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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()) { |