From 17412f4a768e36ba5ecd899610f556424a9471df Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 11 Mar 2016 15:47:30 +0200 Subject: qt5: move to Qt 5.7 Change-Id: I1479b6337a07542ae536e9df97e77921745b7c2e Reviewed-by: David Schulz Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/democompositor_git.bb | 1 - .../packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 - recipes-qt/qt5-addons/qtcharts_git.bb | 31 ---------- recipes-qt/qt5-addons/qtdatavis3d_git.bb | 31 ---------- .../qt5-addons/qtdeclarative-render2d_git.bb | 1 + recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb | 67 ---------------------- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qt3d_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcanvas3d_git.bbappend | 2 +- recipes-qt/qt5/qtcharts_git.bb | 31 ++++++++++ recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 31 ++++++++++ recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bbappend | 2 +- recipes-qt/qt5/qtimageformats_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bbappend | 2 +- recipes-qt/qt5/qtsvg_git.bbappend | 2 +- recipes-qt/qt5/qtsystems_git.bbappend | 8 +-- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qttranslations_git.bbappend | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 67 ++++++++++++++++++++++ recipes-qt/qt5/qtwayland-native_5.7-wip.bb | 28 --------- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_5.7-wip.bb | 29 ---------- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebchannel_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 4 +- recipes-qt/qt5/qtwebsockets_git.bbappend | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bbappend | 2 +- 37 files changed, 157 insertions(+), 221 deletions(-) delete mode 100644 recipes-qt/qt5-addons/qtcharts_git.bb delete mode 100644 recipes-qt/qt5-addons/qtdatavis3d_git.bb delete mode 100644 recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb create mode 100644 recipes-qt/qt5/qtcharts_git.bb create mode 100644 recipes-qt/qt5/qtdatavis3d_git.bb create mode 100644 recipes-qt/qt5/qtvirtualkeyboard_git.bb delete mode 100644 recipes-qt/qt5/qtwayland-native_5.7-wip.bb delete mode 100644 recipes-qt/qt5/qtwayland_5.7-wip.bb (limited to 'recipes-qt') diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb index 314e491..7a5322d 100644 --- a/recipes-qt/b2qt-addons/democompositor_git.bb +++ b/recipes-qt/b2qt-addons/democompositor_git.bb @@ -36,7 +36,6 @@ PV = "5.6+git${SRCPV}" S = "${WORKDIR}/git/wayland/democompositor/" DEPENDS = "qtbase qtwayland" -RDEPENDS_${PN} = "qtwayland (>= 5.7)" do_install_append() { install -d -m0775 ${D}/usr/bin diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 7e8ce67..edb9625 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -29,7 +29,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ qt3d \ qtbase \ - qtbase-fonts \ qtcanvas3d \ qtcharts \ qtconnectivity \ diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5-addons/qtcharts_git.bb deleted file mode 100644 index 5e95d14..0000000 --- a/recipes-qt/qt5-addons/qtcharts_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## 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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "Qt Charts" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3985;beginline=1;endline=17" - -inherit qt5-module qtquickcompiler -require recipes-qt/qt5/qt5-git.inc - -SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599" - -DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5-addons/qtdatavis3d_git.bb deleted file mode 100644 index a148bdc..0000000 --- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## 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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "Qt Data Visualization" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal.h;md5=80b80e41be7c22f5b90fc96163b7d1bf;beginline=1;endline=17" - -inherit qt5-module -require recipes-qt/qt5/qt5-git.inc - -SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba" - -DEPENDS += "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb index 5162519..de9f504 100644 --- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb @@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. inherit qt5-module require recipes-qt/qt5/qt5-git.inc +QT_MODULE_BRANCH = "dev" SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62" DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb deleted file mode 100644 index f4bdbcc..0000000 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## 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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "Qt Virtual Keyboard" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e83db02b9629bbd;beginline=1;endline=17" - -inherit qt5-module qtquickcompiler -require recipes-qt/qt5/qt5-git.inc - -SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf" - -DEPENDS = "qtbase qtdeclarative qtsvg hunspell" - -PACKAGECONFIG ?= "lipi-toolkit lang-all" -PACKAGECONFIG[t9write] = "CONFIG+=t9write" -PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" -PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" -PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" -PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" -PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" -PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" -PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" -PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" -PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" -PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" -PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" -PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" -PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" -PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" -PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" -PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" -PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" -PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" -PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" -PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" -PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" - -EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" - -PACKAGES += "${PN}-dictionaries" -RRECOMMENDS_${PN} += "${PN}-dictionaries" -FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" - -FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug" -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index a63c8b0..436dcfe 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" +SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 7cec73a..5df447f 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -25,4 +25,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" +SRCREV = "a21a4e0391b81307d96364db7af3b8bd343d773f" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 76c3986..94a27f1 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" +SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index eaab0a6..0ae3cfb 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" +SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 0a8d678..c8c57a3 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" +SRCREV = "4f4eda51954b7983016e6a062d3db77a68c2ad67" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb new file mode 100644 index 0000000..9286462 --- /dev/null +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -0,0 +1,31 @@ +############################################################################## +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:COMM$ +## +## 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 http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## $QT_END_LICENSE$ +## +############################################################################## + +DESCRIPTION = "Qt Charts" +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" + +inherit qt5-module qtquickcompiler +require recipes-qt/qt5/qt5-git.inc + +SRCREV = "bbf52870f4e335c0d169907d4398a12cb41ca3a1" + +DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 67cd0dd..fa3bf05 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,5 +19,5 @@ ## ############################################################################## -SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3" +SRCREV = "f8857127320f513e9ec2132bc4af5c470362f37a" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb new file mode 100644 index 0000000..d238835 --- /dev/null +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -0,0 +1,31 @@ +############################################################################## +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:COMM$ +## +## 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 http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## $QT_END_LICENSE$ +## +############################################################################## + +DESCRIPTION = "Qt Data Visualization" +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" + +inherit qt5-module +require recipes-qt/qt5/qt5-git.inc + +SRCREV = "3fb7ce6a29ca69237c777cc65a3831768e938782" + +DEPENDS += "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 804c736..1db39fc 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a" +SRCREV = "f5afec250cc63ba3a7b1cc78f51d5eb0031dd478" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index d5da008..901b376 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646" +SRCREV = "f086de0f3a67698b8066576a423298aadf566e13" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 4213bc9..7ff0b30 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869" +SRCREV = "2d59367241aafbfe6acb30202f64e30697028bd9" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 3b3bae1..ebd6c21 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31" +SRCREV = "e176f25daeb3d80af1fd701000fda065064227e1" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index ca77e8c..4c11a32 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -21,4 +21,4 @@ PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" -SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba" +SRCREV = "0d8366273dcb9af5dae641c7efbc6db878942422" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 2e0fa7b..8dc1203 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -31,7 +31,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" -SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218" +SRCREV = "78ec7b84abd5f499c83b0b2076fb47617a2ebbb7" FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/*/*/designer \ diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 7d64fdc..b1ad2a5 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b" +SRCREV = "c24118685d6eb4cacf5f6af96215ba89ecc28604" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index c9c89ed..21ff48a 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a" +SRCREV = "f8e256271f919c36c8d97eae27b1d11678294e70" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 1605b7b..dd69582 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "48f32572590e45a57573944c0822855819d138df" +SRCREV = "ee4c1b91def347f8f16395585b46e20aebdb2f7b" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index e0b0c7e..f33a067 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45" +SRCREV = "f8449352c9af0ee8055c6a85981e092e9d109b9d" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 56a80d9..b7da638 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c" +SRCREV = "8c23084b207baed7cf58c17e475baa34b889ead2" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 3d02409..c8c7671 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -22,10 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3" - -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" +SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 4200c4d..ccb03b7 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143" +SRCREV = "f29f0a4855eefba944e2dd99e0d6d992b9ebbb1c" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 5045c67..a6bc131 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" +SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb new file mode 100644 index 0000000..bf33b42 --- /dev/null +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -0,0 +1,67 @@ +############################################################################## +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:COMM$ +## +## 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 http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## $QT_END_LICENSE$ +## +############################################################################## + +DESCRIPTION = "Qt Virtual Keyboard" +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" + +inherit qt5-module qtquickcompiler +require recipes-qt/qt5/qt5-git.inc + +SRCREV = "84881cfc58a462189dfeff60c6d6f5717bc4b6b5" + +DEPENDS = "qtbase qtdeclarative qtsvg hunspell" + +PACKAGECONFIG ?= "lipi-toolkit lang-all" +PACKAGECONFIG[t9write] = "CONFIG+=t9write" +PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" +PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" +PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" +PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" +PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" +PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" +PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" +PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" +PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" +PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" +PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" +PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" +PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" +PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" +PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" +PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" +PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" +PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" +PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" +PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" +PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" + +EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" + +PACKAGES += "${PN}-dictionaries" +RRECOMMENDS_${PN} += "${PN}-dictionaries" +FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" + +FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" +FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug" +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb deleted file mode 100644 index 455726a..0000000 --- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## 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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -require recipes-qt/qt5/qtwayland-native_git.bb - -FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:" - -SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2" -PV = "5.7-wip+git${SRCPV}" -QT_MODULE_BRANCH = "wip-compositor-api" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 9e48cab..9783d9e 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" +SRCREV = "01daa660d04e8960961988da6191e80c05a84d58" diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb deleted file mode 100644 index 2de879b..0000000 --- a/recipes-qt/qt5/qtwayland_5.7-wip.bb +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## 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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -require recipes-qt/qt5/qtwayland_git.bb - -SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658" -PV = "5.7-wip+git${SRCPV}" -QT_MODULE_BRANCH = "wip-compositor-api" -EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib" - -SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 9e48cab..9783d9e 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" +SRCREV = "01daa660d04e8960961988da6191e80c05a84d58" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index ac958c0..ee19a33 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea" +SRCREV = "a2c3b32d08ed24279609a8c01b09c1147a9ff6b9" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 0f684cc..4ba8dcf 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f" -SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f" +SRCREV_qtwebengine = "1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f2" +SRCREV_chromium = "eed57693d22920959d6b7c8f2b1b90b501994760" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 528e5b6..09c180c 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef" +SRCREV = "c6d19a89046763f680d7f67c6f9989b4f51fc71e" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 287ed42..1397eea 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915" +SRCREV = "20e5ddeba66121e59058fbe00896e25b5f82ed44" -- cgit v1.2.3-54-g00ecf