From aaaeef29193778b3b4729e41e85ff0c7b450eee1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 9 Aug 2017 18:31:44 +0200 Subject: [PATCH] qtsmarthome: fix missing runtime dependence The demo application uses 'svg' images, so at runtime it depends on 'qtsvg-plugins' package. Also add a patch to fix a runtime warning: Both point size and pixel size set. Using pixel size https://jira.digi.com/browse/DEL-3912 Signed-off-by: Javier Viguera (cherry picked from commit 48ff14dc78c67df11e454645b32abc39625d531f) --- ...0001-qtsmarthome-fix-runtime-warning.patch | 24 +++++++++++++++++++ .../examples/qtsmarthome_1.0.bbappend | 7 ++++++ 2 files changed, 31 insertions(+) create mode 100644 meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch create mode 100644 meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend diff --git a/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch b/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch new file mode 100644 index 000000000..4ed074e69 --- /dev/null +++ b/meta-digi-dey/recipes-qt/examples/qtsmarthome-1.0/0001-qtsmarthome-fix-runtime-warning.patch @@ -0,0 +1,24 @@ +From: Javier Viguera +Date: Tue, 8 Aug 2017 18:17:46 +0200 +Subject: [PATCH] qtsmarthome: fix runtime warning + +Both point size and pixel size set. Using pixel size. + +Signed-off-by: Javier Viguera +--- + components/qml/components/timepicker/PickerPathView.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/components/qml/components/timepicker/PickerPathView.qml b/components/qml/components/timepicker/PickerPathView.qml +index 7038331e3aae..1987d72e32b9 100644 +--- a/components/qml/components/timepicker/PickerPathView.qml ++++ b/components/qml/components/timepicker/PickerPathView.qml +@@ -74,7 +74,7 @@ PathView { + verticalAlignment: Text.AlignVCenter + text: modelData + Component.onCompleted: { +- font.pointSize = font.pointSize * 0.8 ++ font.pixelSize = font.pixelSize * 0.8 + } + } + diff --git a/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend b/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend new file mode 100644 index 000000000..b6f12c13a --- /dev/null +++ b/meta-digi-dey/recipes-qt/examples/qtsmarthome_1.0.bbappend @@ -0,0 +1,7 @@ +# Copyright (C) 2017, Digi International Inc. + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" + +SRC_URI += "file://0001-qtsmarthome-fix-runtime-warning.patch" + +RDEPENDS_${PN} += "qtsvg-plugins"