diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-25 12:26:20 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-27 13:15:21 +0000 |
commit | 1abbc2925f8a43e52c6cb3071e1cdb9353c83071 (patch) | |
tree | e18e3d4af382fab05fab5cf1efd38acc86362373 | |
parent | ba0393de74254a211153b9219fff01ea230f4a6d (diff) | |
download | meta-boot2qt-1abbc2925f8a43e52c6cb3071e1cdb9353c83071.tar.gz |
qt5: update submodules and meta-qt5 layer
Change-Id: I4e67e6d0222f79c135b031f8110d565a3e4243b4
Reviewed-by: Risto Avila <risto.avila@qt.io>
22 files changed, 23 insertions, 81 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index d6ef85a..697a5c8 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |||
@@ -27,7 +27,7 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e" | 30 | SRCREV = "016b5bc949b6dfb2f76db2e8b40a40e7eaee6828" |
31 | 31 | ||
32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" | 32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 980eb48..6a6c5f6 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "52121396c55e6100316f006c87b4fdaa8b5a0719" | 30 | SRCREV = "6e8e228852f0930638b0e0272509809a0fb9ab42" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 49ab463..079b711 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend | |||
@@ -27,7 +27,7 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e" | 30 | SRCREV = "016b5bc949b6dfb2f76db2e8b40a40e7eaee6828" |
31 | 31 | ||
32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" | 32 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 8485dde..773e2de 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend | |||
@@ -37,10 +37,11 @@ PACKAGECONFIG += " \ | |||
37 | glib \ | 37 | glib \ |
38 | iconv \ | 38 | iconv \ |
39 | icu \ | 39 | icu \ |
40 | libinput \ | ||
40 | linuxfb \ | 41 | linuxfb \ |
42 | qml-debug \ | ||
41 | sql-sqlite \ | 43 | sql-sqlite \ |
42 | tslib \ | 44 | tslib \ |
43 | libinput \ | ||
44 | xkbcommon-evdev \ | 45 | xkbcommon-evdev \ |
45 | " | 46 | " |
46 | 47 | ||
@@ -54,4 +55,4 @@ do_configure_prepend() { | |||
54 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs | 55 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs |
55 | } | 56 | } |
56 | 57 | ||
57 | SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e" | 58 | SRCREV = "016b5bc949b6dfb2f76db2e8b40a40e7eaee6828" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 46e4b9a..63d97b2 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend | |||
@@ -27,5 +27,5 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "9d22c12fe4bc6b19c83aa6cf421b90dbeae5f045" | 30 | SRCREV = "515ff5b0f9a2245a13cec6f2d37edd1715cdae8c" |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend index e7d7f79..d2073ba 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bbappend +++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "b6c5569f2158e2f211b90bf36ea964fda7bf6ccc" | 30 | SRCREV = "96086b01a3e732cfb58cfd6e15a8dfc53550eb13" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 3f52959..7e709a7 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "16914894f035963ace51c92de13aad11a53c3cf8" | 30 | SRCREV = "210a4584b87add2061f805ae50eb5079eec48cf5" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 8f04b85..54cdb51 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "7795bb6c194692abbca31a9734c83a78362c8063" | 30 | SRCREV = "99d9e0c527ad91f186628ece1c8b3a5ec07f7add" |
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index cbf52c5..fbe450a 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend | |||
@@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy" | |||
32 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" | 32 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" |
33 | DEPENDS_emulator += "qtsimulator" | 33 | DEPENDS_emulator += "qtsimulator" |
34 | 34 | ||
35 | SRCREV = "66a6bd9fb20e76ab288e4eef59d06c06a411a471" | 35 | SRCREV = "186e4421cf968d1b4927e90340f356c0dac770dd" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index 07af8cc..a62f5ea 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend | |||
@@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) | |||
31 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 31 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
32 | ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" | 32 | ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" |
33 | 33 | ||
34 | SRCREV = "01c9322bfe918b886468eb520d77b21b6d8c0c11" | 34 | SRCREV = "0cb4dc5c1fded81b4f47945b51b8de0b0151bf67" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index c8c701a..3816278 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "c5a44092c8b73c540862c4a160c31487a8518992" | 30 | SRCREV = "124dd9adb5882048e44dcd012e08899d4e480196" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 8222542..4e9fcd0 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "3b093789b07c670e29d3275e26c4e7122db042ae" | 30 | SRCREV = "3bc99dd69fb9099a13dd94ebd081dba5c68d6def" |
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index d838fa0..6744cf3 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend | |||
@@ -30,4 +30,4 @@ | |||
30 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" | 30 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" |
31 | DEPENDS_emulator += "qtsimulator" | 31 | DEPENDS_emulator += "qtsimulator" |
32 | 32 | ||
33 | SRCREV = "df3374bd4bb8af1494f6a35b1102f15cfe9633e0" | 33 | SRCREV = "8065e461421ea17a942ea09d67aaa053a136a54e" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend index 12312d4..412a1dd 100644 --- a/recipes-qt/qt5/qtserialbus_git.bbappend +++ b/recipes-qt/qt5/qtserialbus_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "7845b1c59bde8e2ec8dc541b9f1c1897182e8d0f" | 30 | SRCREV = "8e4bd5bcfd6093c980866a6b258311e7d8ae5bbf" |
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 0745231..6652388 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "0e79f14e56eb43abcb903d5ece41221f6032ef26" | 30 | SRCREV = "e2a658a2472d9fa710c251a065f488bae981c0ae" |
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 31123e8..bac95a9 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "ea6e06c59e901a5b1fc98bc82d15ba9b85e9faf7" | 30 | SRCREV = "7c87ba01191e172bc10fb31f173520cb169a9a03" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index 1e562dd..bf0d13c 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend | |||
@@ -31,4 +31,4 @@ inherit qtquickcompiler | |||
31 | 31 | ||
32 | PACKAGECONFIG = "lipi-toolkit lang-all hunspell" | 32 | PACKAGECONFIG = "lipi-toolkit lang-all hunspell" |
33 | 33 | ||
34 | SRCREV = "78fa7c11ea79067d819bbcbaa903086eae929015" | 34 | SRCREV = "a2174fa1270ff366f03e7d22aa49101c958ca4fc" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend deleted file mode 100644 index ad4d9bb..0000000 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | SRCREV = "3f5111b6c1d92ae4fed008abb53cf4226bfef575" | ||
diff --git a/recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch b/recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch deleted file mode 100644 index 5ea44c0..0000000 --- a/recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 9081e0d5e9432fcb0f1526ecb3788c64d6c731cb Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Tue, 27 Sep 2016 14:13:07 +0300 | ||
4 | Subject: [PATCH] Disable angle for embedded linux | ||
5 | |||
6 | Angle has now hard dependency to mesa (libdrm/gbm). | ||
7 | |||
8 | Change-Id: Ie1e2ef56692f5e311bb2011a15dba9de1bb8de2f | ||
9 | --- | ||
10 | src/core/config/embedded_linux.pri | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri | ||
14 | index 844877e..7a909f1 100644 | ||
15 | --- a/src/core/config/embedded_linux.pri | ||
16 | +++ b/src/core/config/embedded_linux.pri | ||
17 | @@ -39,5 +39,6 @@ GYP_CONFIG += \ | ||
18 | use_x11=0 \ | ||
19 | v8_use_snapshot=false \ | ||
20 | want_separate_host_toolset=1 \ | ||
21 | + angle_enable_gl=0 \ | ||
22 | |||
23 | WEBENGINE_CONFIG *= reduce_binary_size | ||
24 | -- | ||
25 | 1.9.1 | ||
26 | |||
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 4aa0c7a..5441366 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend | |||
@@ -29,12 +29,9 @@ | |||
29 | 29 | ||
30 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | 30 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" |
31 | 31 | ||
32 | SRC_URI += " \ | ||
33 | file://0001-Disable-angle-for-embedded-linux.patch \ | ||
34 | " | ||
35 | SRC_URI_append_mx6 = " \ | 32 | SRC_URI_append_mx6 = " \ |
36 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ | 33 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ |
37 | " | 34 | " |
38 | 35 | ||
39 | SRCREV_qtwebengine = "6106d6b0b3833e63aeb568f37a47fc6adca8fdb9" | 36 | SRCREV_qtwebengine = "4894406d111d7c7c0fb06b56e52706a20b35d0b3" |
40 | SRCREV_chromium = "8158f645b0cfea734b5ff99777227380f615873f" | 37 | SRCREV_chromium = "f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index a87a303..8f19ad0 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | SRCREV = "dba42c925db368aa958c38c6a3481f18a57bd71f" | 30 | SRCREV = "973105d9fb3372910255825e7395fb1156e24c02" |
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index e6a423c..3a64b21 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -24,7 +24,7 @@ | |||
24 | path="sources/meta-openembedded"/> | 24 | path="sources/meta-openembedded"/> |
25 | <project name="meta-qt5" | 25 | <project name="meta-qt5" |
26 | remote="qtyocto" | 26 | remote="qtyocto" |
27 | revision="9195d9dc805fd3132023ff33bc77ace1f3f7e40f" | 27 | revision="f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6" |
28 | path="sources/meta-qt5"/> | 28 | path="sources/meta-qt5"/> |
29 | <project name="meta-mingw" | 29 | <project name="meta-mingw" |
30 | remote="qtyocto" | 30 | remote="qtyocto" |