diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-11 15:47:30 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-13 09:30:24 +0000 |
commit | 17412f4a768e36ba5ecd899610f556424a9471df (patch) | |
tree | 8413be839b94d774c2adb0158dcbd95f4d9fa2fa /recipes-qt/qt5 | |
parent | 579d003d7696ea399b839e430bd8a976d9bb6f66 (diff) | |
download | meta-boot2qt-17412f4a768e36ba5ecd899610f556424a9471df.tar.gz |
qt5: move to Qt 5.7
Change-Id: I1479b6337a07542ae536e9df97e77921745b7c2e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'recipes-qt/qt5')
29 files changed, 110 insertions, 44 deletions
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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" | 22 | SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" |
23 | 23 | ||
24 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" | 24 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" |
25 | 25 | ||
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 = " \ | |||
25 | file://0001-Remove-qgltf.patch \ | 25 | file://0001-Remove-qgltf.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" | 28 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" | 22 | SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" |
23 | 23 | ||
24 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" | 24 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" |
25 | 25 | ||
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() { | |||
45 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs | 45 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs |
46 | } | 46 | } |
47 | 47 | ||
48 | SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" | 48 | SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" |
49 | 49 | ||
50 | # Temporarily here, until merged upstream | 50 | # Temporarily here, until merged upstream |
51 | PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" | 51 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" | 22 | SRCREV = "4f4eda51954b7983016e6a062d3db77a68c2ad67" |
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtcharts_git.bb index 2de879b..9286462 100644 --- a/recipes-qt/qt5/qtwayland_5.7-wip.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -19,11 +19,13 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | require recipes-qt/qt5/qtwayland_git.bb | 22 | DESCRIPTION = "Qt Charts" |
23 | LICENSE = "GPL-3.0" | ||
24 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" | ||
23 | 25 | ||
24 | SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658" | 26 | inherit qt5-module qtquickcompiler |
25 | PV = "5.7-wip+git${SRCPV}" | 27 | require recipes-qt/qt5/qt5-git.inc |
26 | QT_MODULE_BRANCH = "wip-compositor-api" | ||
27 | EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib" | ||
28 | 28 | ||
29 | SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch" | 29 | SRCREV = "bbf52870f4e335c0d169907d4398a12cb41ca3a1" |
30 | |||
31 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3" | 22 | SRCREV = "f8857127320f513e9ec2132bc4af5c470362f37a" |
23 | 23 | ||
diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 455726a..d238835 100644 --- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -19,10 +19,13 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | require recipes-qt/qt5/qtwayland-native_git.bb | 22 | DESCRIPTION = "Qt Data Visualization" |
23 | LICENSE = "GPL-3.0" | ||
24 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" | ||
23 | 25 | ||
24 | FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:" | 26 | inherit qt5-module |
27 | require recipes-qt/qt5/qt5-git.inc | ||
25 | 28 | ||
26 | SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2" | 29 | SRCREV = "3fb7ce6a29ca69237c777cc65a3831768e938782" |
27 | PV = "5.7-wip+git${SRCPV}" | 30 | |
28 | QT_MODULE_BRANCH = "wip-compositor-api" | 31 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a" | 22 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646" | 22 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869" | 22 | 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" | |||
24 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" | 24 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" |
25 | DEPENDS_emulator += "qtsimulator" | 25 | DEPENDS_emulator += "qtsimulator" |
26 | 26 | ||
27 | SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31" | 27 | 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 @@ | |||
21 | 21 | ||
22 | PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" | 22 | PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" |
23 | 23 | ||
24 | SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba" | 24 | 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 = " \ | |||
31 | 31 | ||
32 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" | 32 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" |
33 | 33 | ||
34 | SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218" | 34 | SRCREV = "78ec7b84abd5f499c83b0b2076fb47617a2ebbb7" |
35 | 35 | ||
36 | FILES_${PN}-qmldesigner += " \ | 36 | FILES_${PN}-qmldesigner += " \ |
37 | ${OE_QMAKE_PATH_QML}/*/*/*/designer \ | 37 | ${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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b" | 22 | 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 @@ | |||
22 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" | 22 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" |
23 | DEPENDS_emulator += "qtsimulator" | 23 | DEPENDS_emulator += "qtsimulator" |
24 | 24 | ||
25 | SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a" | 25 | 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 = " \ | |||
31 | 31 | ||
32 | DEPENDS += "qtbase qtserialport" | 32 | DEPENDS += "qtbase qtserialport" |
33 | 33 | ||
34 | SRCREV = "48f32572590e45a57573944c0822855819d138df" | 34 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45" | 22 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c" | 22 | 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 @@ | |||
22 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" | 22 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" |
23 | DEPENDS_emulator += "qtsimulator" | 23 | DEPENDS_emulator += "qtsimulator" |
24 | 24 | ||
25 | SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3" | 25 | SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" |
26 | |||
27 | LIC_FILES_CHKSUM = " \ | ||
28 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
29 | file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
30 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
31 | " | ||
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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143" | 22 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" | 22 | 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 @@ | |||
1 | ############################################################################## | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: http://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:COMM$ | ||
9 | ## | ||
10 | ## Commercial License Usage | ||
11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
12 | ## accordance with the commercial license agreement provided with the | ||
13 | ## Software or, alternatively, in accordance with the terms contained in | ||
14 | ## a written agreement between you and The Qt Company. For licensing terms | ||
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## $QT_END_LICENSE$ | ||
19 | ## | ||
20 | ############################################################################## | ||
21 | |||
22 | DESCRIPTION = "Qt Virtual Keyboard" | ||
23 | LICENSE = "GPL-3.0" | ||
24 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" | ||
25 | |||
26 | inherit qt5-module qtquickcompiler | ||
27 | require recipes-qt/qt5/qt5-git.inc | ||
28 | |||
29 | SRCREV = "84881cfc58a462189dfeff60c6d6f5717bc4b6b5" | ||
30 | |||
31 | DEPENDS = "qtbase qtdeclarative qtsvg hunspell" | ||
32 | |||
33 | PACKAGECONFIG ?= "lipi-toolkit lang-all" | ||
34 | PACKAGECONFIG[t9write] = "CONFIG+=t9write" | ||
35 | PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" | ||
36 | PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" | ||
37 | PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" | ||
38 | PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" | ||
39 | PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" | ||
40 | PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" | ||
41 | PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" | ||
42 | PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" | ||
43 | PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" | ||
44 | PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" | ||
45 | PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" | ||
46 | PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" | ||
47 | PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" | ||
48 | PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" | ||
49 | PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" | ||
50 | PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" | ||
51 | PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" | ||
52 | PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" | ||
53 | PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" | ||
54 | PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" | ||
55 | PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" | ||
56 | |||
57 | EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" | ||
58 | EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" | ||
59 | |||
60 | PACKAGES += "${PN}-dictionaries" | ||
61 | RRECOMMENDS_${PN} += "${PN}-dictionaries" | ||
62 | FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" | ||
63 | |||
64 | FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | ||
65 | FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug" | ||
66 | INSANE_SKIP_${PN} += "libdir" | ||
67 | INSANE_SKIP_${PN}-dbg += "libdir" | ||
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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" | 22 | SRCREV = "01daa660d04e8960961988da6191e80c05a84d58" |
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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" | 22 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea" | 22 | 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 = " \ | |||
25 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ | 25 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f" | 28 | SRCREV_qtwebengine = "1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f2" |
29 | SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f" | 29 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef" | 22 | 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 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915" | 22 | SRCREV = "20e5ddeba66121e59058fbe00896e25b5f82ed44" |