From 1bf6d63760efe5f4a9ce04083d556fd423db9542 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Sep 2016 09:49:12 +0300 Subject: Rename b2qt-utils to qtdeviceutilities Use the correct module name also in the recipe. Add PACKAGECONFIG to build with wpa-supplication support. Change-Id: Ia430912685478d077f997e410257ae1b92d93289 Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-utils.bb | 43 -------------------------------- recipes-qt/qt5/qtdeviceutilities.bb | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 43 deletions(-) delete mode 100644 recipes-qt/b2qt-addons/b2qt-utils.bb create mode 100644 recipes-qt/qt5/qtdeviceutilities.bb (limited to 'recipes-qt') diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb deleted file mode 100644 index 16ce360..0000000 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ /dev/null @@ -1,43 +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$ -## -############################################################################ - -DESCRIPTION = "Boot to Qt Utils module" -LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" - -inherit qt5-module -require recipes-qt/qt5/qt5-git.inc - -SRC_URI = " \ - git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ - " - -SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" - -DEPENDS = "qtbase qtdeclarative wpa-supplicant qtconnectivity" diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb new file mode 100644 index 0000000..a4c0418 --- /dev/null +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -0,0 +1,48 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +DESCRIPTION = "Qt Device Utilities" +LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" + +inherit qt5-module +require recipes-qt/qt5/qt5-git.inc + +PACKAGECONFIG ??= "" +PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" + +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" + +SRC_URI = " \ + git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ + " + +SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" + +DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf