summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-12-12 13:31:16 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-12-14 10:00:53 +0000
commitf0296da6afd374d10788d5dd1ade0fcd6e78ff7f (patch)
tree46048efe0f738e1ebcedbd2daa9080d307f21c40
parent8064c8997e2e72e6d8dc431e71aadbbe8ed9f5fe (diff)
downloadmeta-boot2qt-f0296da6afd374d10788d5dd1ade0fcd6e78ff7f.tar.gz
qt5: update submodules
Enable QtQuickCompiler after fixes landed in QtDeclarative and QtQuickCompiler Change-Id: I339b72fe83316499bdccaf2ae484db63d87c6ed9 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r--classes/internal-build.bbclass2
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bbappend2
-rw-r--r--recipes-qt/qt5/qt3d_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtbase_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtquickcompiler_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bbappend2
-rw-r--r--recipes-qt/qt5/qttools_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bbappend4
-rw-r--r--scripts/manifest.xml2
19 files changed, 20 insertions, 20 deletions
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
index afe7021..ffd38c1 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -35,7 +35,7 @@ python enable_internal_build () {
35 return 35 return
36 36
37 e.data.setVar('ENABLE_QDBD', "1") 37 e.data.setVar('ENABLE_QDBD', "1")
38# e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") 38 e.data.setVar('ENABLE_QTQUICKCOMPILER', "1")
39 e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") 39 e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH")
40 e.data.setVar('PREMIRRORS', "\ 40 e.data.setVar('PREMIRRORS', "\
41 ftp://.*/.* http://yocto-cache.ci.local/sources/ \n \ 41 ftp://.*/.* http://yocto-cache.ci.local/sources/ \n \
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 996b6d6..8863105 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
30SRCREV = "947cace7993807d173656300f4440ae5166624fe" 30SRCREV = "4c0760d327e390a37d0d6ce2016d3a8c5b87a119"
31 31
32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
33 33
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index e1a8c5c..d0c8a35 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
30SRCREV = "a2c6c81f5c67390629a313ff7ba985d0967ca1fa" 30SRCREV = "629de0e31253d9c8b388f6f549aa3ad6abf3c630"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 1e564ed..d69604a 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
30SRCREV = "947cace7993807d173656300f4440ae5166624fe" 30SRCREV = "4c0760d327e390a37d0d6ce2016d3a8c5b87a119"
31 31
32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
33 33
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 22a5de1..6fff60b 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -57,4 +57,4 @@ do_configure_prepend() {
57 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs 57 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
58} 58}
59 59
60SRCREV = "947cace7993807d173656300f4440ae5166624fe" 60SRCREV = "4c0760d327e390a37d0d6ce2016d3a8c5b87a119"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 5245f4c..4c5d330 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "c8cf923ee5076db1b37fdd012994adf72ce6445e" 30SRCREV = "5962967a3712ee711fd9ab58da664a3eb0acb24e"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index ffb028a..8352ad8 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
30SRCREV = "78c593fcdd9cdfa5804404f2120768544c01c7f5" 30SRCREV = "1afb57ed92a25bbc000ea4c4d7662cb8b9e267ee"
31 31
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index b545557..6b24328 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
30SRCREV = "fc5c77e371867cf6be8e270e452e21e5ac338283" 30SRCREV = "884d06db09bc6179baa3add42ff4ef5f3cd0e523"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index 6a399d1..9d8cbde 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy"
32EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" 32EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
33DEPENDS_emulator += "qtsimulator" 33DEPENDS_emulator += "qtsimulator"
34 34
35SRCREV = "ba9b7b9ef674d93680070f6c4bb1053d0d2325dd" 35SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 410368d..fd2a901 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -37,7 +37,7 @@ SRC_URI = " \
37 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ 37 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
38 " 38 "
39 39
40SRCREV = "93c6b5cede6571aba0604e505e00b02ec0088a66" 40SRCREV = "f7d0d43749d9bbd4c695738697ad95998a49956a"
41 41
42S = "${WORKDIR}/git" 42S = "${WORKDIR}/git"
43 43
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
index 03ffc68..5b32995 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
30SRCREV = "661bba4f11666d5d9018a6a1d16a71c324bdf123" 30SRCREV = "cce0aadcd7a15f026c265b23b6e9dbe3310b70b1"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index 2d773fe..5d7e7db 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
30SRCREV = "84b48cadc8f68d57d1a750e6aec690f46582e0c5" 30SRCREV = "201c86391c7ff78d570fdec6e0c0b71eb1e9aae4"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index 44fea17..68d8ed3 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -30,4 +30,4 @@
30EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" 30EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
31DEPENDS_emulator += "qtsimulator" 31DEPENDS_emulator += "qtsimulator"
32 32
33SRCREV = "07bf3002fecd493a47bfb97420d3c3fbe6ee1458" 33SRCREV = "1220a31e6c2f91b34b4a05773621dddab8c4315a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend
index b76fd60..5e8d7ad 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
30SRCREV = "fb63280f12042be341df9de55aa94ca23e991fe9" 30SRCREV = "b11cf357e178aee4b9fa051014e0ec68b7338361"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index ebbcf59..eed87dd 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765" 30SRCREV = "1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 3949e00..56ac513 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
30SRCREV = "c3b5247161eff3b521381a9ada14b180e330a037" 30SRCREV = "4d02101ae8d655c9a5e0152857e0edb0a683ebbf"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index b765686..35cc56d 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "545ef2e21d74128733f3b9b117d7c6024826cbb5" 30SRCREV = "725c71bcb1b5f47e824b45346803250d4a10afdc"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 6f9c12a..4112eb2 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \
33 file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ 33 file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
34 " 34 "
35 35
36SRCREV_qtwebengine = "a79fd91391c489ea1cd7baf717778b75e4847b92" 36SRCREV_qtwebengine = "dc09ed399219ba6dab7368b04f3946131e8089fd"
37SRCREV_chromium = "93b3786290ac16c95f15c95e2c2f3d8254171ab6" 37SRCREV_chromium = "15f8e8e3971c73b9ca8058c7441e5bce8ac42fa9"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 018a4c1..aa4ba24 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -23,7 +23,7 @@
23 path="sources/meta-openembedded"/> 23 path="sources/meta-openembedded"/>
24 <project name="meta-qt5" 24 <project name="meta-qt5"
25 remote="qtyocto" 25 remote="qtyocto"
26 revision="c4a0a450b4275cc3869cf389c92e86b62f09fcea" 26 revision="dc5f0b3004a0b5a9624d6695909f9c6d743429bc"
27 path="sources/meta-qt5"/> 27 path="sources/meta-qt5"/>
28 <project name="meta-mingw" 28 <project name="meta-mingw"
29 remote="qtyocto" 29 remote="qtyocto"