From b852f57c001f4b0843e9df0ea60698b91cbc0bb8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 5 Jun 2017 15:59:59 +0300 Subject: NUC: disable hw cursor for intel nuc This is a workaround for a bug, where fonts are not drawn when hw mouse cursor is used together with Qt Quick Controls 2 Task-number: QTBUG-60957 Task-number: QTBUG-61191 Change-Id: Ia7fc6731eff88f1490c788faa87be3b775ffad6a Reviewed-by: Mikko Gronoff --- .../recipes/qt5/b2qt-appcontroller.bbappend | 38 ++++++++++++++++++++++ .../qt5/b2qt-appcontroller/appcontroller.conf | 7 ++++ .../recipes/qt5/b2qt-appcontroller/kms.conf | 3 ++ meta-intel-extras/recipes/qt5/qtbase_git.bbappend | 30 +++++++++++++++++ .../recipes/recipes-qt/qtbase_git.bbappend | 30 ----------------- 5 files changed, 78 insertions(+), 30 deletions(-) create mode 100644 meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend create mode 100644 meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf create mode 100644 meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf create mode 100644 meta-intel-extras/recipes/qt5/qtbase_git.bbappend delete mode 100644 meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend b/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend new file mode 100644 index 0000000..708ed85 --- /dev/null +++ b/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend @@ -0,0 +1,38 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://kms.conf" + +FILES_${PN} += "${sysconfdir}/kms.conf" + +do_install_append() { + install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ +} diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf new file mode 100644 index 0000000..ca5f455 --- /dev/null +++ b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf @@ -0,0 +1,7 @@ +env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QPA_EGLFS_FORCE888=0 +env=QT_QUICK_CONTROLS_1_STYLE=Flat +env=XDG_RUNTIME_DIR=/tmp +base=linux diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf new file mode 100644 index 0000000..d6da06c --- /dev/null +++ b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf @@ -0,0 +1,3 @@ +{ + "hwcursor": false +} diff --git a/meta-intel-extras/recipes/qt5/qtbase_git.bbappend b/meta-intel-extras/recipes/qt5/qtbase_git.bbappend new file mode 100644 index 0000000..602782e --- /dev/null +++ b/meta-intel-extras/recipes/qt5/qtbase_git.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +PACKAGECONFIG += "gbm kms" diff --git a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend deleted file mode 100644 index 602782e..0000000 --- a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PACKAGECONFIG += "gbm kms" -- cgit v1.2.3-54-g00ecf