summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-12-11 09:14:59 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-11 13:24:22 +0100
commit77f262d7c7013b452b6eba11d329bcb94efde944 (patch)
tree7be944b3f9271f5641509445d5b0dd1154ddefee
parent6566f728ab3d14a4908516fb13ad555dbfe04471 (diff)
downloadmeta-qt5-77f262d7c7013b452b6eba11d329bcb94efde944.tar.gz
qt5-git: Update to 5.4.0+, latest revision in 5.4 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--conf/distro/include/qt5-versions.inc2
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/nativesdk-qttools_git.bb4
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools-native_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
24 files changed, 26 insertions, 26 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 9acde7fb..3ea89163 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -1,5 +1,5 @@
1# Select which version you prefer by defining QT5_VERSION and including this file 1# Select which version you prefer by defining QT5_VERSION and including this file
2# possible values now "5.4.0", "5.3.99+5.4.0-rc1+git%" 2# possible values now "5.4.0", "5.4.0+git%"
3 3
4QT5_VERSION ?= "5.4.0" 4QT5_VERSION ?= "5.4.0"
5 5
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 728cefc2..1e938913 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -37,4 +37,4 @@ SRC_URI += " \
37 file://OEQt5Toolchain.cmake \ 37 file://OEQt5Toolchain.cmake \
38" 38"
39 39
40SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782" 40SRCREV = "47326b9c5c38fea39f8539f50f32667d2c391b70"
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
index 13305d11..00c4ee49 100644
--- a/recipes-qt/qt5/nativesdk-qttools_git.bb
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# prepend this again, because ${PN}.inc prepneds ${PN} 4# prepend this again, because ${PN}.inc prepends ${PN}
5FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" 5FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
6 6
7SRCREV = "f3abe81d510bef5b984544a6d58551ce04cb8b48" 7SRCREV = "33eb6cdf9313f0ad969b4af8fc7160859c2a6319"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 8631e107..26fa2640 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,7 +10,7 @@ SRC_URI += " \
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13PV = "5.3.99+5.4.0-rc1+git${SRCPV}" 13PV = "5.4.0+git${SRCPV}"
14 14
15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" 15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
16 16
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index dc10d0d0..8989fc21 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -30,4 +30,4 @@ do_install_append() {
30 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 30 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
31} 31}
32 32
33SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782" 33SRCREV = "47326b9c5c38fea39f8539f50f32667d2c391b70"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 441a2817..f67ea168 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -24,4 +24,4 @@ SRC_URI += "\
24 file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ 24 file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
25" 25"
26 26
27SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782" 27SRCREV = "47326b9c5c38fea39f8539f50f32667d2c391b70"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index c68032bc..61411cb1 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${BPN}.inc 2require ${BPN}.inc
3 3
4SRCREV = "73563f571e6dfd37a0e4cf90f4679d9901b9233c" 4SRCREV = "944dbb9b558719b3ff9e2d129a328142c0ae6228"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index a159edc7..8479eaf9 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "be6c91acc3ee5ebb8336b9e79df195662ac11788" 4SRCREV = "dbe67b8512bfd78ba3c68fcfff27418bbf54141c"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 71c912a1..ed41baa3 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "9e9600d92224084f7942a6bd83b926c630a29747" 4SRCREV = "1f7e818a8c6ad81299bd82738b191e7d3ba01faf"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 4cd5a64f..980cb5a0 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "486874134b83672ae46bce315f632943829d5303" 4SRCREV = "3c6693ee7f431320b2500c9c4440bb649ed50c89"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 9bfad280..aea75d00 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "59f2bf186400241c62a02044265d9ecab81c1749" 4SRCREV = "f420ac286a303bc235b8c1047f8c845314df1f8a"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index aba3d573..e6595d59 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "3704a616dfabb71ebd3ffc64f8efe32931c82a8b" 4SRCREV = "11df73e4ac2136b72e5fca06bdc4b624a525388a"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 94ee7fdc..8f1ba7d7 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "2bb2ebef4c86c588c3041569ffb090041ffc6b04" 4SRCREV = "c6170fa5ee26cf9d0f2140d998fba2420ad1ed79"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index d0a347d7..7fae0293 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "ff98a9a27a18e6a48afa705e5cd84bd9461ad554" 4SRCREV = "817a964c710e4bc08b56f45d942944a038d6ab9c"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index adafefb4..8a5c84d8 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "ab51ad6a5f4e533c31bd8e5b6f16a3bcd09a3ee6" 4SRCREV = "cd9c48833cf4fbf73df68dcdb83f261c03950f91"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 7940ee58..bf7bf38e 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "78dcdd807c06009460a949a7015b63f0f75ac61b" 4SRCREV = "5decb627d19ddb2b2aea4d7c317b9abfb86b5b8f"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 320bc7f9..7eb98b46 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -6,4 +6,4 @@ QT_MODULE_BRANCH = "dev"
6# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 6# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
7# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.4 7# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.4
8 8
9SRCREV = "3a0216301ad1338126abb326e8e4c22c6ea12f40" 9SRCREV = "44f70d99a2ecd5f3f320650461f1d69142d11bcc"
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index 7c6905a6..f4eacd19 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "7e7d549d26028ff407a9a3d260955f95b403a406" 4SRCREV = "33eb6cdf9313f0ad969b4af8fc7160859c2a6319"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 7c6905a6..f4eacd19 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "7e7d549d26028ff407a9a3d260955f95b403a406" 4SRCREV = "33eb6cdf9313f0ad969b4af8fc7160859c2a6319"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index da38195c..b8f4a0dd 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "e47474cf91be5fa1d12bf329526d938be8293638" 4SRCREV = "26ec3626f1088c272e3232f0341781bb38f518f3"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 1ce30436..a78c34d4 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "e47474cf91be5fa1d12bf329526d938be8293638" 4SRCREV = "26ec3626f1088c272e3232f0341781bb38f518f3"
5 5
6SRC_URI += " \ 6SRC_URI += " \
7 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 7 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index f5699bc6..31467cb9 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -10,8 +10,8 @@ SRC_URI += " \
10 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ 10 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
11 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 11 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
12" 12"
13SRCREV_qtwebengine = "ff47f09a94a0a31edd40500985ff670e8f35cc2c" 13SRCREV_qtwebengine = "8eefc3a0658d1b10de12f43534cfd63af825ebc8"
14SRCREV_chromium = "66388297cf2ca42049fb099237134ec33465e2f5" 14SRCREV_chromium = "be4ec3fa64a4c6c2b641830a9811ab7847c7dd39"
15SRCREV = "${SRCREV_qtwebengine}" 15SRCREV = "${SRCREV_qtwebengine}"
16 16
17SRCREV_FORMAT = "qtwebengine" 17SRCREV_FORMAT = "qtwebengine"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index feb860c1..0e780f15 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "18cb1a3ae907d76da9eb8c54528cf3bcb074d0e5" 4SRCREV = "88c4538698fbfd7bc7d4e546abb17f9014ed61bd"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index a4c0da28..05ecad05 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "64927e04f202d33b9a9a1f94141ef692c0b513ac" 4SRCREV = "df6cc41fbdbed5d61bb43e491c2f2eea32cdc596"