qt5: Add Qt 5.3.2 packages

index 0fc4e62..ff2eae7 100644
@@ -1,7 +1,7 @@
 # Select which version you prefer by defining QT5_VERSION and including this file
-# possible values now "5.3.1", "5.3.0+git%"
+# possible values now "5.3.2", "5.3.0+git%"
 
-QT5_VERSION ?= "5.3.1"
+QT5_VERSION ?= "5.3.2"
 
 PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
 PREFERRED_VERSION_qtbase = "${QT5_VERSION}"

deleted file mode 100644
index dfab4a1..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "572c9953847d391f2d33b420bbcdca46"
-SRC_URI[sha256sum] = "7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569"

new file mode 100644
index 0000000..49b9072
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "563e2b10274171f1184b3fd7260b4991"
+SRC_URI[sha256sum] = "9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8"

deleted file mode 100644
index cce0210..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "7264920fc489ac878d40218263df8c4e"
-SRC_URI[sha256sum] = "edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7"

new file mode 100644
index 0000000..3efed85
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "9074cc89bc52aea7f76a4d231d2f0ef6"
+SRC_URI[sha256sum] = "5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e"

similarity index 100%
rename from recipes-qt/qt5/qt5-5.3.1.inc
rename to recipes-qt/qt5/qt5-5.3.2.inc

similarity index 63%
rename from recipes-qt/qt5/qtbase-native_5.3.1.bb
rename to recipes-qt/qt5/qtbase-native_5.3.2.bb
index a23f80f..44dd984 100644
@@ -7,5 +7,5 @@ do_install_append() {
     ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
 }
 
-SRC_URI[md5sum] = "572c9953847d391f2d33b420bbcdca46"
-SRC_URI[sha256sum] = "7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569"
+SRC_URI[md5sum] = "563e2b10274171f1184b3fd7260b4991"
+SRC_URI[sha256sum] = "9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8"

deleted file mode 100644
index dfab4a1..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "572c9953847d391f2d33b420bbcdca46"
-SRC_URI[sha256sum] = "7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569"

new file mode 100644
index 0000000..49b9072
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "563e2b10274171f1184b3fd7260b4991"
+SRC_URI[sha256sum] = "9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8"

deleted file mode 100644
index 10b2b4d..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "2693394de6dd97d3a054791cef77b928"
-SRC_URI[sha256sum] = "dc5253a62e178a0882a74dc48114c7fd2a3e8feea91df0d9670f11d16361ee67"

new file mode 100644
index 0000000..ca0013b
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "e496963407bb0c7b2e6c07133715a9cf"
+SRC_URI[sha256sum] = "2eb972b85697e9752ed2f2f7e194393650743737a9fe5f48177734c4dbd9096f"

deleted file mode 100644
index 51606ce..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "765579f4f64cb64a812c8a80104eb8ec"
-SRC_URI[sha256sum] = "9a80d401dfbb64f109abf210cb32775a102f7b2420b3a3175b8dab0792220380"

new file mode 100644
index 0000000..655f316
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "72ae60527ebb15f4b85cfbadc4c174de"
+SRC_URI[sha256sum] = "04108193b9642c0394c157e98b5c1d81f555f9f495289e07ebfb6f03448b2382"

deleted file mode 100644
index b949ad3..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "89bffcd329886fd1fe4e504c666987cd"
-SRC_URI[sha256sum] = "6e1ba11fb84f9778497baff1ae06364d8ff13cd79a66d671a35832e7e856702d"

new file mode 100644
index 0000000..f7a7b1e
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "53b67cf5470dfa9bcfc59aa5b8bfd66d"
+SRC_URI[sha256sum] = "d5b84656dc6a349db380e42690a18137e562dbaba1930216bb3e3815df6af708"

deleted file mode 100644
index 870387c..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "bed5b36e721de1e356b879e5c811d799"
-SRC_URI[sha256sum] = "53d8a4846f1fefb13aba4cebf3d3f808df69ec187cc435e895eb34152c4e860f"

new file mode 100644
index 0000000..1900f9d
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "6dd8dd6906bbfb52a292cd25927bb9a8"
+SRC_URI[sha256sum] = "688f2658a13d2919487d3f5acacb037364ee5c8fe0319f524a7d0a4987ba7ffc"

deleted file mode 100644
index 608ce9a..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "8bf9b65e5a586091d0ce9f9107367f4a"
-SRC_URI[sha256sum] = "62e790029ddf0c5eea7623958ef97144b3c94113cab1e9fa5fbf326625dba3bf"

new file mode 100644
index 0000000..69dfaae
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "255bb7f28c667ab91303e6af271753b5"
+SRC_URI[sha256sum] = "d303cbceb73774edc0cfdbde6b97b0e41077e242ff6520710890f81bea40e2d4"

deleted file mode 100644
index babec18..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "697731ec5aaf482826495cd419cab4f0"
-SRC_URI[sha256sum] = "1b3f262569c329cddfd9355994a47b7f62b70f15343e1d818c706bf4473dbbf5"

new file mode 100644
index 0000000..eaf16a7
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "1ad3ee98f6f5d71df8dda14edc06346c"
+SRC_URI[sha256sum] = "37b4072b531c35389b3acbbbd7259ab6ce4106177b96d67bfe5d3236139814d7"

deleted file mode 100644
index 9056dce..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "b373739f085207dda92b3399d477faf8"
-SRC_URI[sha256sum] = "c4108979f869645d91d7bcc2004b4bcfbae7332c1281ed5697a551a0d046e98c"

new file mode 100644
index 0000000..6c46934
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "5ef68e85b9d32865a4bf7f491ff31f96"
+SRC_URI[sha256sum] = "255fac66c93f33743c707da3d41d95c7c562924fe4eb829cbb7b21b2274a0e0b"

deleted file mode 100644
index fdb9a0e..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "401ebe552dc76041e2485507ecbdfc80"
-SRC_URI[sha256sum] = "44902d12a0a711e39f611db1cedff4e4144c21d9f0d6527181a132224381191f"

new file mode 100644
index 0000000..20cbb3a
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "3a57c52d6d4d6632d67a4ebd35abe0c5"
+SRC_URI[sha256sum] = "9b7b2e895180e4e3e1ed4e7b5ad049b7d021a05c96be6edc5fc433c6de6273fb"

deleted file mode 100644
index 4d94305..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "90bffd1ea73d2f13322b25aa1b2d5e25"
-SRC_URI[sha256sum] = "f6936130d7d2f08062dd9b9b19dcde56511ff038e57ae813fbb0943477871c1d"

new file mode 100644
index 0000000..6d9a9d6
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "05f490fd6a7d3bca0c4d4a59989daef0"
+SRC_URI[sha256sum] = "5f890f014d087141b0aaa8954b21b1f85740233b60a556e0e9624227bff6d94e"

deleted file mode 100644
index 4d088cb..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "262c142aac926b492a1bf7fa3f9a96c2"
-SRC_URI[sha256sum] = "5bbfa86bf646fbc863f2a674c83b366b65301d3e1529ffe86860eb90fca13a85"

new file mode 100644
index 0000000..8b21571
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "d0e70adf7c993f33bad27290dae778d5"
+SRC_URI[sha256sum] = "6e18002c8c993402c7d28b3c0705092e41c18769b6d3ff741e9a3b3ce9d6d7be"

deleted file mode 100644
index a5e20d2..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "ce3868ac3be057ba112f4c8f6da67e94"
-SRC_URI[sha256sum] = "8f41113571ace59f88e91d74e113e24f8f934f6b571da3c976b53bd42e86c238"

new file mode 100644
index 0000000..3a4c287
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "d0a8dc3173bfc9dc9f2632d509a76e6f"
+SRC_URI[sha256sum] = "f9359dc42fbd7105eec7a1fb866e90aa772fd694075e5a5691d1a31d08953ae4"

deleted file mode 100644
index b7db9a0..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "d9557391a3ab696089d657cb3a2b608e"
-SRC_URI[sha256sum] = "83dc0b1152043d4e04e6135ea65accc749424b498ee018de9b390d712ccbc065"

new file mode 100644
index 0000000..1f1126d
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "0a38cfe5c81364f2b93d0d38b94d375f"
+SRC_URI[sha256sum] = "a886e0cb08be60e57958676dc91c6f649468184a03c89c2aeabc904d36fd5a4b"

deleted file mode 100644
index 5a7512f..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "1a54f0495ad7239038f57d8a2715203c"
-SRC_URI[sha256sum] = "c2daa131cd41f230d5903e1b754249ed16609df98a08e70b62b5610c4a3a1774"

new file mode 100644
index 0000000..9c71dac
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "f7972e80970ff26a908c43defb3d10e6"
+SRC_URI[sha256sum] = "1ec5c2f307ee55740cc8c82dc2ca4037dbc0ca398b4e32abbd967535e71ae30f"

deleted file mode 100644
index cce0210..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "7264920fc489ac878d40218263df8c4e"
-SRC_URI[sha256sum] = "edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7"

new file mode 100644
index 0000000..3efed85
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "9074cc89bc52aea7f76a4d231d2f0ef6"
+SRC_URI[sha256sum] = "5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e"

deleted file mode 100644
index cce0210..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "7264920fc489ac878d40218263df8c4e"
-SRC_URI[sha256sum] = "edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7"

new file mode 100644
index 0000000..3efed85
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "9074cc89bc52aea7f76a4d231d2f0ef6"
+SRC_URI[sha256sum] = "5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e"

deleted file mode 100644
index a25d285..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "5827c61adba1d6921c51ef7ba1adce68"
-SRC_URI[sha256sum] = "8d4b5845b0fd99511ea7e7901d46ba8d50dc1f19cbce4496f279677e7ac45aca"

new file mode 100644
index 0000000..9c93c20
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "6f88c2a99002801a1943483331f8b4f0"
+SRC_URI[sha256sum] = "c8081a0863b7d8e2e39ec0e2fe288331ddab093a682959ba7378392512296482"

deleted file mode 100644
index a622ef3..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "0f2bb8af6be2306b2b4d194a7ebf6fcc"
-SRC_URI[sha256sum] = "69a47c5645918fc27bff630275685f300e42b4dfd99ccd3e5aa1c8a6d0725156"

new file mode 100644
index 0000000..aa49463
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "0497b5b46540848e0db6a9e219d756fb"
+SRC_URI[sha256sum] = "e47122ed15e8e1cc32e11b3cd89bacc056437215134a204899f2fddb4fd92e5b"

deleted file mode 100644
index 95ad22d..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "275078e21f8d84c29e0cce6fd58ae28c"
-SRC_URI[sha256sum] = "5b68ce55bab94d0d9dfa86ef7a2c3f402e931cc12fd028766f531148b9e31ddc"

new file mode 100644
index 0000000..8ebc50e
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "093ddc113952e47bd0e251986e03f1e4"
+SRC_URI[sha256sum] = "60533d413b0fa27b1e08642ae77bcaa76a845fa39ddc3d49af573a77e73a38c2"

deleted file mode 100644
index 071ac6d..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "184cdea8945a6d62131fae75c673225d"
-SRC_URI[sha256sum] = "25fa2801367c050ac19ad3b6f92d38890314c9cbf2d833b1571e1a7ea22b4f71"

new file mode 100644
index 0000000..9bfe71b
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "59f6cbbdf2ad48c6b95b65f8b333df2d"
+SRC_URI[sha256sum] = "ca6a28c95be0bf18080b4a20ae9e2c24a77a45aaf557f06047e65b1280c17251"

deleted file mode 100644
index 8242d0f..0000000
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "d263163cc6e9ba7a4e8bd6c558f3ae42"
-SRC_URI[sha256sum] = "c597ed383d1d433960ffeb4a3784979235a399e62b27b60b5d67aa2c9aa8653f"

new file mode 100644
index 0000000..9cda6cc
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "857e8040b2bf45c114a7d75ec6ef94ee"
+SRC_URI[sha256sum] = "acab0307039e117475caf2c95e425ead09ab5ee08ce15205fb3c0af7d7ec1abb"

index d06c521..08486df 100644
@@ -6,14 +6,15 @@ require ${PN}.inc
 # the master branch which will lead to 1.0 when Qt 5.4 is released here.
 PV = "0.9.99+git${SRCPV}"
 
-QT_MODULE_BRANCH = "master"
+QT_MODULE_BRANCH = "1.0"
+QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based"
 
 # For now we have to define SRC_URI here again as qt5-git.inc points to
 # qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will
 # switch soon.
 SRC_URI = " \
-    git://gitorious.org/qt-labs/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
-    git://gitorious.org/qt-labs/chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH};destsuffix=git/src/3rdparty \
+    git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
+    git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
     file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \
     file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0003-functions.prf-Try-to-add-_moc-suffix.patch \

new file mode 100644
index 0000000..1cf1242
@@ -0,0 +1,27 @@
+From 9ad77853050ccd2102fe4c9ad0671b82554ce4c1 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Fri, 3 Oct 2014 03:52:11 +0200
+Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc when
+ building for x64 arch
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ chromium/base/base.gypi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi
+index a5a990a..af30cfa 100644
+--- a/src/3rdparty/chromium/base/base.gypi
++++ b/src/3rdparty/chromium/base/base.gypi
+@@ -745,7 +745,7 @@
+                 ['include', '^nix/'],
+               ],
+           }],
+-          ['use_qt==1 and target_arch=="ia32"', {
++          ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', {
+               'sources/': [
+                 ['include', 'atomicops_internals_x86_gcc.cc'],
+               ],
+-- 
+2.1.1
+

index 08486df..dd93d1f 100644
@@ -20,6 +20,7 @@ SRC_URI = " \
     file://0003-functions.prf-Try-to-add-_moc-suffix.patch \
     file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \
     file://0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch \
+    file://0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
 "
 SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b"
 SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"

index e3b2863..6987c9f 100644
@@ -27,12 +27,12 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 SRC_URI += " \
-    file://0011-Always-build-uic.patch \
+    file://0012-Always-build-uic.patch \
 "
 
 # specific for nativesdk-qtbase
 SRC_URI += " \
-    file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \
+    file://0013-configure-preserve-built-qmake-and-swap-with-native-.patch \
 "
 
 PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools"

index e935d70..f58fdb7 100644
@@ -24,7 +24,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 SRC_URI += " \
-    file://0011-Always-build-uic.patch \
+    file://0012-Always-build-uic.patch \
 "
 
 QT_CONF_PATH = "${B}/qt.conf"

index 9941cda..bafb59e 100644
@@ -17,7 +17,7 @@ SRC_URI += "\
 
 # specific for qtbase
 SRC_URI += "\
-    file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
+    file://0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
 "
 
 DEPENDS += "qtbase-native"

index f2a7c0e..64829fa 100644
@@ -1,7 +1,7 @@
-From c5b50848ead7de12ec18cd30940d74d92b974280 Mon Sep 17 00:00:00 2001
+From 9816098355731afb60cd41d334be97d07f0dcc42 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/12] Add linux-oe-g++ platform
+Subject: [PATCH 01/13] Add linux-oe-g++ platform
 
 * This qmake.conf unlike other platforms reads most variables from
   shell environment, because it's easier for qt recipes to export

@@ -51,7 +51,7 @@ Signed-off-by: Martin Jansa <[email protected]>
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
 diff --git a/configure b/configure
-index d5c2b08..4eae0d3 100755
+index cb8d78f..3f7b41b 100755
 --- a/configure
 +++ b/configure
 @@ -324,6 +324,16 @@ getQMakeConf()

@@ -346,5 +346,5 @@ index 0000000..dd12003
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.0.0
+2.1.1
 

index 247bfb7..669ebb2 100644
@@ -1,7 +1,7 @@
-From 5d83d8ce8b601a983b055f32dc67a418a0ce06ab Mon Sep 17 00:00:00 2001
+From 2749053c1a0670fea50f2f716fea0839fbbbb007 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <[email protected]>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 02/13] qlibraryinfo: allow to set qt.conf from the outside
  using the environment
 
 Allow to set a qt.conf from the outside using the environment. This allows

@@ -35,5 +35,5 @@ index 174c1d0..69e614f 100644
      if(!QFile::exists(qtconfig))
          qtconfig = qt_libraryInfoFile();
 -- 
-2.0.0
+2.1.1
 

index 2abea8f..d5df4f6 100644
@@ -1,7 +1,7 @@
-From b544f5f3462e2981ada045a32038b7f116f8590c Mon Sep 17 00:00:00 2001
+From e263260c50051327e3f7f2ca8c46e014228e0078 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 03/12] Add -external-hostbindir option
+Subject: [PATCH 03/13] Add -external-hostbindir option
 
 * when cross-compiling it's sometimes useful to use existing tools from machine
   (or in OpenEmbedded built with separate native recipe) when building for target

@@ -38,10 +38,10 @@ Signed-off-by: Jonathan Liu <[email protected]>
  11 files changed, 51 insertions(+), 13 deletions(-)
 
 diff --git a/configure b/configure
-index d5c2b08..dcd066c 100755
+index 3f7b41b..18d1a0b 100755
 --- a/configure
 +++ b/configure
-@@ -759,6 +759,7 @@ QT_HOST_BINS=
+@@ -777,6 +777,7 @@ QT_HOST_BINS=
  QT_HOST_LIBS=
  QT_HOST_DATA=
  QT_EXT_PREFIX=

@@ -49,7 +49,7 @@ index d5c2b08..dcd066c 100755
  
  #flags for SQL drivers
  QT_CFLAGS_PSQL=
-@@ -878,6 +879,7 @@ while [ "$#" -gt 0 ]; do
+@@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do
      -testsdir| \
      -hostdatadir| \
      -hostbindir| \

@@ -57,7 +57,7 @@ index d5c2b08..dcd066c 100755
      -hostlibdir| \
      -extprefix| \
      -sysroot| \
-@@ -1092,6 +1094,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do
      extprefix)
          QT_EXT_PREFIX="$VAL"
          ;;

@@ -67,7 +67,7 @@ index d5c2b08..dcd066c 100755
      pkg-config)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_PKGCONFIG="$VAL"
-@@ -2230,6 +2235,10 @@ Installation options:
+@@ -2248,6 +2253,10 @@ Installation options:
      -hostdatadir <dir> . Data used by qmake will be installed to <dir>
                           (default HOSTPREFIX)
  

@@ -78,7 +78,7 @@ index d5c2b08..dcd066c 100755
  Configure options:
  
   The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -2897,6 +2906,11 @@ fi
+@@ -2915,6 +2924,11 @@ fi
  # command line and environment validation
  #-------------------------------------------------------------------------------
  

@@ -90,7 +90,7 @@ index d5c2b08..dcd066c 100755
  # update QT_CONFIG to show our current predefined configuration
  CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
  case "$CFG_QCONFIG" in
-@@ -3577,6 +3591,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
+@@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
      "qt_hbinpath=$QT_HOST_BINS",
      "qt_hlibpath=$QT_HOST_LIBS",
      "qt_hdatpath=$QT_HOST_DATA",

@@ -211,10 +211,10 @@ index 9bda70e..6e3605a 100644
      _qt5_Core_check_file_exists(${imported_location})
  
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 174c1d0..1fe03cb 100644
+index 69e614f..a95ca35 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild()
+@@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild()
   */
  
  static const struct {

@@ -223,7 +223,7 @@ index 174c1d0..1fe03cb 100644
  } qtConfEntries[] = {
      { "Prefix", "." },
      { "Documentation", "doc" }, // should be ${Data}/doc
-@@ -359,6 +359,7 @@ static const struct {
+@@ -362,6 +362,7 @@ static const struct {
      { "HostBinaries", "bin" },
      { "HostLibraries", "lib" },
      { "HostData", "." },

@@ -279,10 +279,10 @@ index 99d87e2..5621dc0 100644
      _qt5_Widgets_check_file_exists(${imported_location})
  
 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index b756509..7e61845 100644
+index 90981f6..7d73882 100644
 --- a/tools/configure/configureapp.cpp
 +++ b/tools/configure/configureapp.cpp
-@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine()
+@@ -1215,6 +1215,13 @@ void Configure::parseCmdLine()
              dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
          }
  

@@ -296,7 +296,7 @@ index b756509..7e61845 100644
          else if (configCmdLine.at(i) == "-make-tool") {
              ++i;
              if (i == argCount)
-@@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp()
+@@ -4006,6 +4013,7 @@ void Configure::generateQConfigCpp()
                    << "    \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
                    << "    \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
                    << "    \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl

@@ -305,5 +305,5 @@ index b756509..7e61845 100644
                    << "    \"qt_hostspec=" << hostSpec << "\"," << endl
                    << "#endif" << endl
 -- 
-2.0.1
+2.1.1
 

index db6266d..adf1c4a 100644
@@ -1,7 +1,7 @@
-From 4a86d338f04c2bfa4d3f63a2fa9d1252503757fd Mon Sep 17 00:00:00 2001
+From 34a32208034a03c0d591dc79386f97ae020652e7 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 04/13] configureapp: Prefix default LIBDIRS and INCDIRS with
  SYSROOT
 
 Upstream-Status: Pending

@@ -11,10 +11,10 @@ Upstream-Status: Pending
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 7e61845..29c6358 100644
+index 7d73882..c572fbb 100644
 --- a/tools/configure/configureapp.cpp
 +++ b/tools/configure/configureapp.cpp
-@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
+@@ -3393,8 +3393,8 @@ void Configure::generateQConfigPri()
          configStream << "    QT_ARCH = " << dictionary["QT_ARCH"] << endl;
          if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
              // FIXME: add detection

@@ -26,5 +26,5 @@ index 7e61845..29c6358 100644
          configStream << "}" << endl;
          configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
 -- 
-2.0.0
+2.1.1
 

index e189c22..fe2fd6a 100644
@@ -1,7 +1,7 @@
-From 71e5a4c62ca38b30a14c9957db21a7cbf5fcf54d Mon Sep 17 00:00:00 2001
+From 9e7667c9124ab287dc0f7ad40c2b61c435ffc186 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements
+Subject: [PATCH 05/13] qt_module: Fix pkgconfig and libtool replacements
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

@@ -80,7 +80,7 @@ index 4dcabe9..d04bc3e 100644
      lib_replace.CONFIG = path
      QMAKE_PRL_INSTALL_REPLACE += lib_replace
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 8bf4c92..ee2e989 100644
+index 8bf4c92..2e229fc 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -188,10 +188,25 @@ unix|mingw {

@@ -110,5 +110,5 @@ index 8bf4c92..ee2e989 100644
  }
  
 -- 
-2.0.0
+2.1.1
 

index e70417c..08629f5 100644
@@ -1,7 +1,7 @@
-From a3e87ebdf7dff6b9d4b1d8191f044cfb56b9da3d Mon Sep 17 00:00:00 2001
+From ce38ab8b2167b74fa90eb3e17507dc9e799a3274 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 21 Apr 2014 19:22:04 +0200
-Subject: [PATCH 06/12] Revert "eglfs: Print the chosen config in debug mode"
+Subject: [PATCH 06/13] Revert "eglfs: Print the chosen config in debug mode"
 
 This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
 ---

@@ -52,5 +52,5 @@ index eec6463..4a7c69b 100644
      // Make the context current to ensure the GL version query works. This needs a surface too.
      const EGLint pbufferAttributes[] = {
 -- 
-2.0.0
+2.1.1
 

index b5e46d7..c1ffb91 100644
@@ -1,7 +1,7 @@
-From 75fbeec66d98aacad5be1e3fcfd92f42b1ef0da7 Mon Sep 17 00:00:00 2001
+From 7c16b57ecdddffb4bb52d32bb763791fd8aa8414 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Wed, 19 Mar 2014 18:32:28 +0100
-Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h
+Subject: [PATCH 07/13] qeglplatformintegration: Undefine CursorShape from X.h
 
 Signed-off-by: Martin Jansa <[email protected]>
 ---

@@ -26,5 +26,5 @@ index f665455..9eb783c 100644
  
  class QEGLPlatformScreen;
 -- 
-2.0.0
+2.1.1
 

index 5df8330..370cc48 100644
@@ -1,7 +1,7 @@
-From a3beca1f4ba231baf38e7de0221e55681437966d Mon Sep 17 00:00:00 2001
+From 68e499a4a521f3876aca195ba8ed5b63d45d09ed Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Mon, 11 Nov 2013 20:27:30 -0500
-Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 08/13] configure: bump path length from 256 to 512 characters
 
 Increase the path length that gets hardcoded into generated config.cpp file
 from 256 to 512 characters, as nativesdk path can be quite long.

@@ -12,7 +12,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 48d5119..3c0347a 100755
+index 18d1a0b..ca0824f 100755
 --- a/configure
 +++ b/configure
 @@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$

@@ -25,5 +25,5 @@ index 48d5119..3c0347a 100755
      "qt_prfxpath=$QT_SYSROOT_PREFIX",
      "qt_docspath=$QT_SYSROOT_DOCS",
 -- 
-2.0.0
+2.1.1
 

index c3750b8..bbd27b9 100644
@@ -1,7 +1,7 @@
-From 6d1123116233e55c4ade13378eec41fb7441cec6 Mon Sep 17 00:00:00 2001
+From 3408e6d6c56a18bed48353c2f1b2e18f6716fc4e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Wed, 5 Feb 2014 18:35:08 +0100
-Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one
+Subject: [PATCH 09/13] eglfs: fix egl error for platforms only supporting one
  window/surface
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644
  
      if (isRaster()) {
 -- 
-2.0.0
+2.1.1
 

index 9fb7e08..07f9795 100644
@@ -1,7 +1,7 @@
-From 2a6891f2cbf221b51b214a527adb4602e20b100b Mon Sep 17 00:00:00 2001
+From 4a6476822784ca6a10f59cfb3e941854ccea8408 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Wed, 4 Jun 2014 15:26:11 +0200
-Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf"
+Subject: [PATCH 10/13] Revert "Use the "gcc" feature in simd.prf"
 
 This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489.
 ---

@@ -22,5 +22,5 @@ index 62a63f9..4f86f60 100644
          HEADERS += $$SSE2_HEADERS
  
 -- 
-2.0.0
+2.1.1
 

index 27496db..f2031f7 100644
@@ -1,7 +1,7 @@
-From 606dc31c85d97dff52b07ec9c896718c6533f670 Mon Sep 17 00:00:00 2001
+From 3902dcd1d7da169229deffbff02ac1a159b08d44 Mon Sep 17 00:00:00 2001
 From: Jani Hautakangas <[email protected]>
 Date: Thu, 16 May 2013 09:52:07 +0300
-Subject: [PATCH 11/11] QOpenGLPaintDevice sub-area support
+Subject: [PATCH 11/13] QOpenGLPaintDevice sub-area support
 
 Allows creating QOpenGLPaintDevice targetting sub-area
 of binded framebuffer.

@@ -148,5 +148,5 @@ index 0610ab6..ea1e3b2 100644
      } else {
          if (m_vao.isCreated()) {
 -- 
-2.0.2
+2.1.1
 

similarity index 87%
rename from recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
rename to recipes-qt/qt5/qtbase/0012-Always-build-uic.patch
index dcd10bd..46ae47f 100644
@@ -1,7 +1,7 @@
-From bf4593d727fa673734bb1930f79fc012e52250ec Mon Sep 17 00:00:00 2001
+From bdcbca2fcb09d48af75e99b7dfa6ce211507925c Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
-Subject: [PATCH 11/12] Always build uic
+Subject: [PATCH 12/13] Always build uic
 
 Even if we are not building gui or widgets. This tool is needed later
 as a native tool when compiling the target.

@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644
  nacl: SUBDIRS -= src_network src_testlib
  
 -- 
-2.0.0
+2.1.1
 

similarity index 88%
rename from recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
rename to recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 7135a49..7145796 100644
@@ -1,7 +1,7 @@
-From 6317e81c96cec598da266d0c863afa4320d1e38a Mon Sep 17 00:00:00 2001
+From bb0958af49c1ad4d35b6b6b9033cd46eda4a3ac8 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <[email protected]>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build
+Subject: [PATCH 12/12] qmake: don't build it in configure, but allow to build
  it separately
 
 * it is already built in qtbase-native, so we don't need it in configure

@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <[email protected]>
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 3c0347a..a75ca11 100755
+index ca0824f..5a09ae3 100755
 --- a/configure
 +++ b/configure
 @@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()

@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644
  VPATH += \
      ../src/corelib/global \
 -- 
-2.0.0
+2.1.1
 

similarity index 81%
rename from recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
rename to recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch
index 32d67db..667c9ec 100644
@@ -1,7 +1,7 @@
-From bfc795c5af38731dbd18d20467e27dd710df374c Mon Sep 17 00:00:00 2001
+From 68bd66b37455f9b27b2f030948943942e12b3af1 Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Mon, 11 Nov 2013 20:22:34 -0500
-Subject: [PATCH 12/12] configure: preserve built qmake and swap with native
+Subject: [PATCH 13/13] configure: preserve built qmake and swap with native
  one
 
 Let configure script build the real qmake, but right after it's built, swap

@@ -13,7 +13,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/configure b/configure
-index 3c0347a..c51f785 100755
+index ca0824f..2c097c3 100755
 --- a/configure
 +++ b/configure
 @@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];

@@ -26,5 +26,5 @@ index 3c0347a..c51f785 100755
  echo "Running configuration tests..."
  
 -- 
-2.0.0
+2.1.1
 

index b1e8dff..c597bce 100644
@@ -1,4 +1,4 @@
-From c38b854abffbae52c118a361e49987a7623e231a Mon Sep 17 00:00:00 2001
+From fd077fa40e7750f5836a07dde4f9c65864f87c3f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
 Date: Sun, 26 May 2013 14:26:19 +0200
 Subject: [PATCH] qmltestexample: fix link

@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644
  
  load(qt_tool)
 -- 
-2.0.0
+2.1.1
 

index d12851f..f473f23 100644
@@ -1,4 +1,4 @@
-From f309b1e149764a193cbfc694973083e70b5f4a7e Mon Sep 17 00:00:00 2001
+From 862ce82f7c0237b839539332c860e12c7d3c3e67 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 4 Aug 2014 19:19:05 +0200
 Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic

@@ -27,5 +27,5 @@ index 8382e5c..63d13ce 100644
  
  load(qt_parts)
 -- 
-2.0.4
+2.1.1
 

index 98a77b9..c32ddaf 100644
@@ -1,4 +1,4 @@
-From 8d396ebedaa9ed6d9152fb8a4f90a3ea347fdec0 Mon Sep 17 00:00:00 2001
+From f8e3c6be700907a597ae706afeec14e26103b31e Mon Sep 17 00:00:00 2001
 From: Yoann Lopes <[email protected]>
 Date: Thu, 31 Oct 2013 15:06:30 +0100
 Subject: [PATCH 1/2] Initial porting effort to GStreamer 1.0.

@@ -26,7 +26,7 @@ Conflicts:
  config.tests/gstreamer_appsrc/gstreamer_appsrc.pro |  13 +-
  .../gstreamer_encodingprofiles.pro                 |  13 +-
  .../gstreamer_photography.pro                      |  15 +-
- qtmultimedia.pro                                   |  22 ++-
+ qtmultimedia.pro                                   |  25 ++-
  src/gsttools/gsttools.pro                          |  22 +--
  src/gsttools/gstvideoconnector.c                   | 199 +++++++++++++++++++--
  src/gsttools/qgstappsrc.cpp                        |  29 ++-

@@ -58,7 +58,7 @@ Conflicts:
  .../mediaplayer/qgstreamerplayerserviceplugin.cpp  |  27 ++-
  .../mediaplayer/qgstreamerplayersession.cpp        | 154 ++++++++++++++--
  .../mediaplayer/qgstreamerplayersession.h          |   9 +
- 36 files changed, 873 insertions(+), 131 deletions(-)
+ 36 files changed, 875 insertions(+), 132 deletions(-)
 
 diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro
 index 02a7e34..6b9843a 100644

@@ -149,10 +149,10 @@ index 6b530cb..975991f 100644
 +LIBS += -lgstphotography-$$GST_VERSION
  
 diff --git a/qtmultimedia.pro b/qtmultimedia.pro
-index c7f093c..37f42a0 100644
+index 3cec526..109dd81 100644
 --- a/qtmultimedia.pro
 +++ b/qtmultimedia.pro
-@@ -21,10 +21,24 @@ win32 {
+@@ -17,11 +17,26 @@ win32 {
  } else {
      qtCompileTest(alsa)
      qtCompileTest(pulseaudio)

@@ -160,6 +160,7 @@ index c7f093c..37f42a0 100644
 -        qtCompileTest(gstreamer_photography)
 -        qtCompileTest(gstreamer_encodingprofiles)
 -        qtCompileTest(gstreamer_appsrc)
+-        qtCompileTest(linux_v4l)
 +    !done_config_gstreamer {
 +        gstver=1.0
 +        cache(GST_VERSION, set, gstver);

@@ -167,6 +168,7 @@ index c7f093c..37f42a0 100644
 +            qtCompileTest(gstreamer_photography)
 +            qtCompileTest(gstreamer_encodingprofiles)
 +            qtCompileTest(gstreamer_appsrc)
++            qtCompileTest(linux_v4l)
 +        } else {
 +            gstver=0.10
 +            cache(GST_VERSION, set, gstver);

@@ -176,13 +178,14 @@ index c7f093c..37f42a0 100644
 +                qtCompileTest(gstreamer_photography)
 +                qtCompileTest(gstreamer_encodingprofiles)
 +                qtCompileTest(gstreamer_appsrc)
++                qtCompileTest(linux_v4l)
 +            }
 +        }
      }
      qtCompileTest(resourcepolicy)
      qtCompileTest(gpu_vivante)
 diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
-index 15edd04..d252344 100644
+index 7c809a7..6b9bf5d 100644
 --- a/src/gsttools/gsttools.pro
 +++ b/src/gsttools/gsttools.pro
 @@ -2,7 +2,7 @@ TEMPLATE = lib

@@ -239,7 +242,7 @@ index 15edd04..d252344 100644
 +    LIBS_PRIVATE += -lgstapp-$$GST_VERSION
  }
  
- HEADERS += $$PRIVATE_HEADERS
+ config_linux_v4l: DEFINES += USE_V4L
 diff --git a/src/gsttools/gstvideoconnector.c b/src/gsttools/gstvideoconnector.c
 index 3e08fe5..ff3f9a3 100644
 --- a/src/gsttools/gstvideoconnector.c

@@ -1698,10 +1701,10 @@ index 9f1a765..dd6bd02 100644
      if (m_duration != duration) {
          m_duration = duration;
 diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
-index 6e3448f..0dbf848 100644
+index a835b1c..6bd3682 100644
 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
 +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
-@@ -726,7 +726,11 @@ qint64 CameraBinSession::duration() const
+@@ -731,7 +731,11 @@ qint64 CameraBinSession::duration() const
      GstFormat   format = GST_FORMAT_TIME;
      gint64      duration = 0;
  

@@ -1713,7 +1716,7 @@ index 6e3448f..0dbf848 100644
          return duration / 1000000;
      else
          return 0;
-@@ -759,8 +763,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data)
+@@ -764,8 +768,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data)
  
      if (m_camerabin) {
          GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER);

@@ -1727,7 +1730,7 @@ index 6e3448f..0dbf848 100644
              gst_tag_setter_reset_tags(GST_TAG_SETTER(element));
  
              QMapIterator<QByteArray, QVariant> it(data);
-@@ -821,7 +830,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
+@@ -826,7 +835,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
  
      if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) {
          if (m_captureMode == QCamera::CaptureStillImage &&

@@ -1739,7 +1742,7 @@ index 6e3448f..0dbf848 100644
              st = gst_message_get_structure(gm);
  
              if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) {
-@@ -831,7 +844,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
+@@ -836,7 +849,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
  
                      QImage img;
  

@@ -1751,7 +1754,7 @@ index 6e3448f..0dbf848 100644
                      if (caps) {
                          GstStructure *structure = gst_caps_get_structure(caps, 0);
                          gint width = 0;
-@@ -1103,7 +1120,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame
+@@ -1109,7 +1126,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame
          gst_structure_remove_all_fields(structure);
          gst_structure_set_value(structure, "framerate", &rate);
      }

@@ -1763,7 +1766,7 @@ index 6e3448f..0dbf848 100644
  
  
      for (uint i=0; i<gst_caps_get_size(caps); i++) {
-@@ -1223,7 +1244,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
+@@ -1229,7 +1250,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
          gst_structure_set_value(structure, "width", &w);
          gst_structure_set_value(structure, "height", &h);
      }

@@ -1833,10 +1836,10 @@ index 7649010..fce55ac 100644
  
  OTHER_FILES += \
 diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
-index 518a66b..0c99502 100644
+index b9114c6..97d9203 100644
 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
 +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
-@@ -504,6 +504,11 @@ GstElement *QGstreamerCaptureSession::buildImageCapture()
+@@ -506,6 +506,11 @@ GstElement *QGstreamerCaptureSession::buildImageCapture()
      gst_pad_add_buffer_probe(pad, G_CALLBACK(passImageFilter), this);
      gst_object_unref(GST_OBJECT(pad));
  

@@ -1858,7 +1861,7 @@ index 2ca9377..b986fc7 100644
      mediaplayer.json
 -
 diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
-index ff99aa3..f9de6a7 100644
+index 99c471b..deec236 100644
 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
 +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
 @@ -527,6 +527,8 @@ void QGstreamerPlayerControl::processEOS()

@@ -2374,5 +2377,5 @@ index 23e7031..707779b 100644
  
  QT_END_NAMESPACE
 -- 
-2.0.0
+2.1.1
 

index f0a9611..23c400c 100644
@@ -1,4 +1,4 @@
-From 8d0358d4d586daece0e683ba002fbab16fd53cd1 Mon Sep 17 00:00:00 2001
+From 5b6ff7fc6a102c9dc00ba947efbe000f34addbd5 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 5 Jul 2014 09:10:02 +0200
 Subject: [PATCH 2/2] qtmultimedia.pro: Respect

@@ -6,11 +6,11 @@ Subject: [PATCH 2/2] qtmultimedia.pro: Respect
 
 Signed-off-by: Martin Jansa <[email protected]>
 ---
- qtmultimedia.pro | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
+ qtmultimedia.pro | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/qtmultimedia.pro b/qtmultimedia.pro
-index 37f42a0..5a2a533 100644
+index 109dd81..54b67a8 100644
 --- a/qtmultimedia.pro
 +++ b/qtmultimedia.pro
 @@ -1,7 +1,7 @@

@@ -22,7 +22,7 @@ index 37f42a0..5a2a533 100644
  win32 {
      qtCompileTest(directshow) {
          qtCompileTest(wshellitem)
-@@ -22,13 +22,16 @@ win32 {
+@@ -18,14 +18,17 @@ win32 {
      qtCompileTest(alsa)
      qtCompileTest(pulseaudio)
      !done_config_gstreamer {

@@ -32,6 +32,7 @@ index 37f42a0..5a2a533 100644
 -            qtCompileTest(gstreamer_photography)
 -            qtCompileTest(gstreamer_encodingprofiles)
 -            qtCompileTest(gstreamer_appsrc)
+-            qtCompileTest(linux_v4l)
 -        } else {
 +        OE_GSTREAMER_ENABLED {
 +            gstver=1.0

@@ -40,6 +41,7 @@ index 37f42a0..5a2a533 100644
 +                qtCompileTest(gstreamer_photography)
 +                qtCompileTest(gstreamer_encodingprofiles)
 +                qtCompileTest(gstreamer_appsrc)
++                qtCompileTest(linux_v4l)
 +            }
 +        }
 +        !OE_GSTREAMER_ENABLED:OE_GSTREAMER010_ENABLED {

@@ -47,5 +49,5 @@ index 37f42a0..5a2a533 100644
              cache(GST_VERSION, set, gstver);
              # Force a re-run of the test
 -- 
-2.0.0
+2.1.1
 

index e668edd..5cebe25 100644
@@ -1,4 +1,4 @@
-From f4eb217f9b706a13e7f8256b8540970cfc78d805 Mon Sep 17 00:00:00 2001
+From 7bd3f1feea0ec1121a73faa1214e72702954b317 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Wed, 11 Sep 2013 18:30:08 +0200
 Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert

@@ -150,5 +150,5 @@ index c3acfe3..f2f88f7 100644
  installed_cmake.depends = cmake
  
 -- 
-2.0.0
+2.1.1
 

index 042605c..d25904e 100644
@@ -1,4 +1,4 @@
-From 2b9829a4aa1379a69343371991a81b3769ac7dec Mon Sep 17 00:00:00 2001
+From a74f00b2a64dde326a78f7523f875d7e14ee45f5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Fri, 17 Jan 2014 14:33:19 +0100
 Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries

@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
 +
 +LIBS += -lQt5CLucene
 -- 
-2.0.0
+2.1.1
 

index fa3ac1a..98a0bc6 100644
@@ -1,4 +1,4 @@
-From 6bb257d69ba7ac93b2b11aae35e0a523785d94ad Mon Sep 17 00:00:00 2001
+From 7388296f5219725801aeb9d8b0a2f4ba01a7ca6d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Wed, 4 Jun 2014 11:28:16 +0200
 Subject: [PATCH 3/3] add noqtwebkit configuration

@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644
  win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
  qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
 -- 
-2.0.4
+2.1.1
 

index 1fac95b..e224e55 100644
@@ -1,4 +1,4 @@
-From 761367755efa529c41ba414521eaed0b10873d99 Mon Sep 17 00:00:00 2001
+From fd79724a05ee7fb52d8ac1b02057e7a1ba4efb14 Mon Sep 17 00:00:00 2001
 From: Simon Busch <[email protected]>
 Date: Fri, 19 Jul 2013 13:35:14 +0000
 Subject: [PATCH] Install the qtwaylandscanner tool to the native side

@@ -11,7 +11,7 @@ Signed-off-by: Simon Busch <[email protected]>
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro
-index ac2d07b..53b93f9 100644
+index ac2d07b..7a46a24 100644
 --- a/src/qtwaylandscanner/qtwaylandscanner.pro
 +++ b/src/qtwaylandscanner/qtwaylandscanner.pro
 @@ -1,6 +1,10 @@

@@ -28,5 +28,5 @@ index ac2d07b..53b93f9 100644
 +target.path = $$[QT_HOST_BINS]
 +INSTALLS += target
 -- 
-1.8.1.2
+2.1.1
 

index 998f8b6..1b46f9b 100644
@@ -1,4 +1,4 @@
-From 201b36614907584a0d446975bddbb11a495540ed Mon Sep 17 00:00:00 2001
+From 6e554b116bfe57744a3de02370fd96b9ea13ecb2 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 22 Feb 2014 17:47:44 +0100
 Subject: [PATCH] examples.pro: include server-buffer only when building with

@@ -14,10 +14,10 @@ Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/examples/examples.pro b/examples/examples.pro
-index 2d4cd1b..fb2497e 100644
+index d633fb9..643c7cd 100644
 --- a/examples/examples.pro
 +++ b/examples/examples.pro
-@@ -13,5 +13,7 @@ contains(CONFIG, wayland-compositor) {
+@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) {
          SUBDIRS += qml-compositor
      }
  

@@ -27,5 +27,5 @@ index 2d4cd1b..fb2497e 100644
 +    }
  }
 -- 
-1.8.5.3
+2.1.1
 

index 07e4436..4073319 100644
@@ -1,4 +1,4 @@
-From 89c132829d1a93d662f617c2a7be75c5e6eaa33a Mon Sep 17 00:00:00 2001
+From fe714df9641286e3f005e0021e1c6462fb0b061e Mon Sep 17 00:00:00 2001
 From: Trevor Woerner <[email protected]>
 Date: Fri, 7 Feb 2014 04:07:17 +0100
 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)

@@ -14,11 +14,11 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 2 deletions(-)
 
 diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
-index 79b7208..6dff72b 100644
+index 75df1c5..5d9a4d2 100644
 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf
 +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -58,8 +58,6 @@ linux-*g++* {
-     QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
+@@ -56,8 +56,6 @@ linux-*g++* {
+     }
  }
  
 -contains(TEMPLATE, app): CONFIG += rpath

@@ -27,5 +27,5 @@ index 79b7208..6dff72b 100644
      # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
      !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
 -- 
-1.8.5.3
+2.1.1
 

index 6987c9f..faecc64 100644
@@ -142,7 +142,6 @@ do_configure() {
     fi
 
     ${S}/configure -v \
-        -dont-process \
         -opensource -confirm-license \
         -sysroot ${STAGING_DIR_NATIVE} \
         -no-gcc-sysroot \

index f58fdb7..3ba7f8e 100644
@@ -34,7 +34,6 @@ do_generate_qt_config_file() {
 }
 
 EXTRA_OECONF = " \
-    -dont-process \
     -prefix ${prefix} \
     -sysroot ${STAGING_DIR_NATIVE} \
     -no-gcc-sysroot \

index bafb59e..176aec4 100644
@@ -168,7 +168,6 @@ do_configure() {
     fi
 
     ${S}/configure -v \
-        -dont-process \
         -opensource -confirm-license \
         -sysroot ${STAGING_DIR_TARGET} \
         -no-gcc-sysroot \

index 82750e7..761cfb6 100644
@@ -6,8 +6,3 @@ require ${PN}.inc
 
 SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f"
 QT_MODULE_BRANCH = "5.4"
-
-# wayland-scanner and qtwaylandscanner must be in same path to work properly
-do_install_append() {
-    ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
-}

index ff2eae7..7530a24 100644
@@ -1,5 +1,5 @@
 # Select which version you prefer by defining QT5_VERSION and including this file
-# possible values now "5.3.2", "5.3.0+git%"
+# possible values now "5.3.2", "5.3.0+5.4.0-alpha1+git"
 
 QT5_VERSION ?= "5.3.2"
 

@@ -7,6 +7,7 @@ PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
 PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
 PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}"
 PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}"
+PREFERRED_VERSION_qtconnectivity = "${QT5_VERSION}"
 PREFERRED_VERSION_qtenginio = "${QT5_VERSION}"
 PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}"
 PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}"

@@ -23,6 +24,9 @@ PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
 PREFERRED_VERSION_qttools = "${QT5_VERSION}"
 PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
 PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}"
+PREFERRED_VERSION_qtwayland = "${QT5_VERSION}"
+PREFERRED_VERSION_qtwayland-native = "${QT5_VERSION}"
+PREFERRED_VERSION_qtwebengine = "${QT5_VERSION}"
 PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
 PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
 PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}"

index 4b91539..6de07e0 100644
@@ -19,8 +19,7 @@ SRC_URI += "\
     file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
     file://0008-configure-bump-path-length-from-256-to-512-character.patch \
     file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
-    file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \
-    file://0011-QOpenGLPaintDevice-sub-area-support.patch \
+    file://0010-QOpenGLPaintDevice-sub-area-support.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase

@@ -33,4 +32,10 @@ SRC_URI += " \
     file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \
 "
 
-SRCREV = "7a4dcbaabf037a6913a5662ebb74cc47e04673b9"
+SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03"
+
+LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

index 3d8dfeb..b3169bc 100644
@@ -4,4 +4,9 @@ require ${PN}.inc
 # prepend this again, because ${PN}.inc prepneds ${PN}
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
 
-SRCREV = "aa35d132010f4410d72e30d03e3dd713c7a2241d"
+SRCREV = "a1ca5b48fafc536b619617f8fa6a3e4798283812"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

index 3e714e0..36fbaf8 100644
@@ -1,7 +1,7 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2014 Martin Jansa <[email protected]>
 
-QT_MODULE_BRANCH ?= "stable"
+QT_MODULE_BRANCH ?= "5.4"
 
 # each module needs to define valid SRCREV
 SRC_URI += " \

@@ -10,7 +10,7 @@ SRC_URI += " \
 
 S = "${WORKDIR}/git"
 
-PV = "5.3.0+git${SRCPV}"
+PV = "5.3.99+5.4.0-alpha1+git${SRCPV}"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
 

index eca6b36..60a2339 100644
@@ -1,7 +1,7 @@
-From 9c7d71880c6ec5b07e3030b7c7a23e004d5c60a2 Mon Sep 17 00:00:00 2001
+From 7a573e702d37f3e83b92f6b07345aaab05261e7b Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/12] Add linux-oe-g++ platform
+Subject: [PATCH 01/11] Add linux-oe-g++ platform
 
 * This qmake.conf unlike other platforms reads most variables from
   shell environment, because it's easier for qt recipes to export

@@ -51,10 +51,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
 diff --git a/configure b/configure
-index d5c2b08..4eae0d3 100755
+index 1efb645..b1dfca9 100755
 --- a/configure
 +++ b/configure
-@@ -324,6 +324,16 @@ getQMakeConf()
+@@ -316,6 +316,16 @@ getQMakeConf()
      getSingleQMakeVariable "$1" "$specvals"
  }
  

@@ -71,7 +71,7 @@ index d5c2b08..4eae0d3 100755
  getXQMakeConf()
  {
      if [ -z "$xspecvals" ]; then
-@@ -333,6 +343,16 @@ getXQMakeConf()
+@@ -325,6 +335,16 @@ getXQMakeConf()
      getSingleQMakeVariable "$1" "$xspecvals"
  }
  

@@ -88,7 +88,7 @@ index d5c2b08..4eae0d3 100755
  compilerSupportsFlag()
  {
      cat >conftest.cpp <<EOF
-@@ -548,21 +568,19 @@ fi
+@@ -541,21 +561,19 @@ fi
  # initalize variables
  #-------------------------------------------------------------------------------
  

@@ -118,7 +118,7 @@ index d5c2b08..4eae0d3 100755
  # Use CC/CXX to run config.tests
  mkdir -p "$outpath/config.tests"
  rm -f "$outpath/config.tests/.qmake.cache"
-@@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+@@ -3141,7 +3159,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
      [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
  fi
  

@@ -127,7 +127,7 @@ index d5c2b08..4eae0d3 100755
  
  TEST_COMPILER=$QMAKE_CONF_COMPILER
  
-@@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+@@ -3176,7 +3194,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
          exit 1
      fi
  fi

@@ -136,7 +136,7 @@ index d5c2b08..4eae0d3 100755
  
  GCC_MACHINE_DUMP=
  case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3633,6 +3651,14 @@ setBootstrapVariable()
+@@ -3647,6 +3665,14 @@ setBootstrapVariable()
      getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
  }
  

@@ -151,7 +151,7 @@ index d5c2b08..4eae0d3 100755
  # build qmake
  if true; then ###[ '!' -f "$outpath/bin/qmake" ];
      echo "Creating qmake..."
-@@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3685,14 +3711,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
          fi
  
          [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=

@@ -175,7 +175,7 @@ index d5c2b08..4eae0d3 100755
          if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
              setBootstrapVariable QMAKE_CFLAGS_RELEASE
 diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index fe41c54..e2db923 100644
+index 05e10c9..213eeb8 100644
 --- a/mkspecs/features/configure.prf
 +++ b/mkspecs/features/configure.prf
 @@ -60,12 +60,12 @@ defineTest(qtCompileTest) {

@@ -187,7 +187,7 @@ index fe41c54..e2db923 100644
  
      mkpath($$test_out_dir)|error("Aborting.")
  
-     qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
+     qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") {
 -        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
 +        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
              log("yes$$escape_expand(\\n)")

@@ -346,5 +346,5 @@ index 0000000..dd12003
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.0.0
+2.1.1
 

index 29f788e..06331aa 100644
@@ -1,7 +1,7 @@
-From ad884ab378939e685a3b00af03bb6875d9bdc1d5 Mon Sep 17 00:00:00 2001
+From e521cd2d84acad69fb3d57a5e97073898d03fbf0 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <[email protected]>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside
  using the environment
 
 Allow to set a qt.conf from the outside using the environment. This allows

@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 6d25325..80e0f30 100644
+index c3ec2bc..1be2659 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings()
+@@ -147,7 +147,10 @@ QLibrarySettings::QLibrarySettings()
  
  QSettings *QLibraryInfoPrivate::findConfiguration()
  {

@@ -35,5 +35,5 @@ index 6d25325..80e0f30 100644
      if(!QFile::exists(qtconfig))
          qtconfig = qt_libraryInfoFile();
 -- 
-2.0.0
+2.1.1
 

143 lines not on this page · raw message

index 78fb3c6..b7e515a 100644
@@ -1,7 +1,7 @@
-From 8a14a69d5b0078554ed002e682c72e995b1e6320 Mon Sep 17 00:00:00 2001
+From 73d7d25b8a424eecef197de60a3a504e163f0816 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with
  SYSROOT
 
 Upstream-Status: Pending

@@ -11,10 +11,10 @@ Upstream-Status: Pending
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 7e61845..29c6358 100644
+index 7969132..439dcfb 100644
 --- a/tools/configure/configureapp.cpp
 +++ b/tools/configure/configureapp.cpp
-@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
+@@ -3373,8 +3373,8 @@ void Configure::generateQConfigPri()
          configStream << "    QT_ARCH = " << dictionary["QT_ARCH"] << endl;
          if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
              // FIXME: add detection

@@ -26,5 +26,5 @@ index 7e61845..29c6358 100644
          configStream << "}" << endl;
          configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
 -- 
-2.0.0
+2.1.1
 

index 182de79..d1ec16c 100644
@@ -1,7 +1,7 @@
-From 1e87c127c5d268870c51894c955bf24cde83ff69 Mon Sep 17 00:00:00 2001
+From fcbe3eefa24348cbf98ca9fc9e137ac6ccaf1f87 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements
+Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <[email protected]>
  2 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index 4dcabe9..d04bc3e 100644
+index ebc5f00..46319d8 100644
 --- a/mkspecs/features/qt_common.prf
 +++ b/mkspecs/features/qt_common.prf
 @@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {

@@ -80,7 +80,7 @@ index 4dcabe9..d04bc3e 100644
      lib_replace.CONFIG = path
      QMAKE_PRL_INSTALL_REPLACE += lib_replace
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 8bf4c92..ee2e989 100644
+index 6ab8267..2b4943c 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -188,10 +188,25 @@ unix|mingw {

@@ -110,5 +110,5 @@ index 8bf4c92..ee2e989 100644
  }
  
 -- 
-2.0.0
+2.1.1
 

121 lines not on this page · raw message

index 1f029a2..8f46910 100644
@@ -1,7 +1,7 @@
-From 3d61189d1706d3367eada4e7db6f2c6c167130ce Mon Sep 17 00:00:00 2001
+From 9563ef306503f2503a09aadce63020b3048a185d Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Wed, 19 Mar 2014 18:32:28 +0100
-Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h
+Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h
 
 Signed-off-by: Martin Jansa <[email protected]>
 ---

@@ -9,11 +9,11 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 6 insertions(+)
 
 diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
-index f665455..9eb783c 100644
+index 4d7adce..c9b6873 100644
 --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
 +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
-@@ -46,6 +46,12 @@
- #include <qpa/qplatformnativeinterface.h>
+@@ -50,6 +50,12 @@
+ #include <QtCore/QVariant>
  #include <EGL/egl.h>
  
 +// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/

@@ -26,5 +26,5 @@ index f665455..9eb783c 100644
  
  class QEGLPlatformScreen;
 -- 
-2.0.0
+2.1.1
 

index b1c4690..afe9b74 100644
@@ -1,7 +1,7 @@
-From 107fe67947ced65315550e6a7795be24efaab371 Mon Sep 17 00:00:00 2001
+From 33d46bd0229ff9635c14724231eb95f556afd5c2 Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Mon, 11 Nov 2013 20:27:30 -0500
-Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 08/11] configure: bump path length from 256 to 512 characters
 
 Increase the path length that gets hardcoded into generated config.cpp file
 from 256 to 512 characters, as nativesdk path can be quite long.

@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 48d5119..3c0347a 100755
+index dcd1790..fe6bed4 100755
 --- a/configure
 +++ b/configure
-@@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+@@ -3587,7 +3587,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
  static const char qt_configure_installation          [12+11]    = "qt_instdate=`date +%Y-%m-%d`";
  
  /* Installation Info */

@@ -25,5 +25,5 @@ index 48d5119..3c0347a 100755
      "qt_prfxpath=$QT_SYSROOT_PREFIX",
      "qt_docspath=$QT_SYSROOT_DOCS",
 -- 
-2.0.0
+2.1.1
 

index cbd0bcd..de3e2d6 100644
@@ -1,7 +1,7 @@
-From b8f2fdcd7683058554b5d76b270c5f4bb3d0b91a Mon Sep 17 00:00:00 2001
+From 5d088522706a3533800e51c011c93d3d2ea58a4d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Wed, 5 Feb 2014 18:35:08 +0100
-Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one
+Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one
  window/surface
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

@@ -27,10 +27,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
-index 2d36c0b..854531e 100644
+index c83b894..b937881 100644
 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
 +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
-@@ -74,6 +74,15 @@ void QEglFSWindow::create()
+@@ -66,6 +66,15 @@ void QEglFSWindow::create()
  
      m_flags = Created;
  

@@ -46,16 +46,16 @@ index 2d36c0b..854531e 100644
      if (window()->type() == Qt::Desktop)
          return;
  
-@@ -85,7 +94,7 @@ void QEglFSWindow::create()
-         if (isRaster() && screen->compositingWindow())
+@@ -79,7 +88,7 @@ void QEglFSWindow::create()
              return;
+         }
  
 -#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)
 +#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB)
          // We can have either a single OpenGL window or multiple raster windows.
          // Other combinations cannot work.
          qFatal("EGLFS: OpenGL windows cannot be mixed with others.");
-@@ -105,6 +114,11 @@ void QEglFSWindow::create()
+@@ -99,6 +108,11 @@ void QEglFSWindow::create()
  
      resetSurface();
  

@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644
  
      if (isRaster()) {
 -- 
-2.0.0
+2.1.1
 

similarity index 84%
rename from recipes-qt/qt5/qtbase-git/0011-QOpenGLPaintDevice-sub-area-support.patch
rename to recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
index 27496db..db979bd 100644
@@ -1,7 +1,7 @@
-From 606dc31c85d97dff52b07ec9c896718c6533f670 Mon Sep 17 00:00:00 2001
+From 709c35b889e46f2b1bc36d88c732f1b440e6c236 Mon Sep 17 00:00:00 2001
 From: Jani Hautakangas <[email protected]>
 Date: Thu, 16 May 2013 09:52:07 +0300
-Subject: [PATCH 11/11] QOpenGLPaintDevice sub-area support
+Subject: [PATCH 10/11] QOpenGLPaintDevice sub-area support
 
 Allows creating QOpenGLPaintDevice targetting sub-area
 of binded framebuffer.

@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  5 files changed, 23 insertions(+), 3 deletions(-)
 
 diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
-index 6750458..034630a 100644
+index 59bca6e..ea0ee88 100644
 --- a/src/gui/opengl/qopenglpaintdevice.cpp
 +++ b/src/gui/opengl/qopenglpaintdevice.cpp
-@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
+@@ -103,6 +103,7 @@ class QOpenGLPaintDevicePrivate
  public:
      QOpenGLPaintDevicePrivate(const QSize &size);
  

@@ -31,7 +31,7 @@ index 6750458..034630a 100644
      QSize size;
      QOpenGLContext *ctx;
  
-@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
+@@ -151,6 +152,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
  {
  }
  

@@ -44,7 +44,7 @@ index 6750458..034630a 100644
  /*!
      Destroys the QOpenGLPaintDevice.
  */
-@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const
+@@ -220,6 +227,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const
      return d_ptr->ctx;
  }
  

@@ -57,10 +57,10 @@ index 6750458..034630a 100644
      Returns the pixel size of the paint device.
  
 diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
-index c05571c..01eb1bc 100644
+index e1be9b5..1a3ddbc 100644
 --- a/src/gui/opengl/qopenglpaintdevice.h
 +++ b/src/gui/opengl/qopenglpaintdevice.h
-@@ -62,12 +62,14 @@ public:
+@@ -54,12 +54,14 @@ public:
      QOpenGLPaintDevice();
      explicit QOpenGLPaintDevice(const QSize &size);
      QOpenGLPaintDevice(int width, int height);

@@ -76,10 +76,10 @@ index c05571c..01eb1bc 100644
      void setSize(const QSize &size);
      void setDevicePixelRatio(qreal devicePixelRatio);
 diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
-index 81a0d82..ce57261 100644
+index 21bc4a9..ce008a4 100644
 --- a/src/gui/opengl/qopenglpaintengine.cpp
 +++ b/src/gui/opengl/qopenglpaintengine.cpp
-@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
+@@ -1999,7 +1999,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
      for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
          d->vertexAttributeArraysEnabledState[i] = false;
  

@@ -90,7 +90,7 @@ index 81a0d82..ce57261 100644
      d->width = sz.width();
      d->height = sz.height();
      d->mode = BrushDrawingMode;
-@@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
+@@ -2084,7 +2087,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
          d->device->ensureActiveTarget();
  
          d->transferMode(BrushDrawingMode);

@@ -99,7 +99,7 @@ index 81a0d82..ce57261 100644
          d->needsSync = false;
          d->lastMaskTextureUsed = 0;
          d->shaderManager->setDirty();
-@@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2127,6 +2130,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
      if (bounds == QRect(0, 0, width, height)) {
          funcs.glDisable(GL_SCISSOR_TEST);
      } else {

@@ -107,7 +107,7 @@ index 81a0d82..ce57261 100644
          funcs.glEnable(GL_SCISSOR_TEST);
          setScissor(bounds);
      }
-@@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2135,12 +2139,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
  
  void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
  {

@@ -123,10 +123,10 @@ index 81a0d82..ce57261 100644
  
      funcs.glScissor(left, bottom, width, height);
 diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
-index 4f0e2e5..f211de1 100644
+index 5ef0366..c5b517d 100644
 --- a/src/gui/opengl/qopenglpaintengine_p.h
 +++ b/src/gui/opengl/qopenglpaintengine_p.h
-@@ -264,6 +264,7 @@ public:
+@@ -256,6 +256,7 @@ public:
      QOpenGL2PaintEngineEx* q;
      QOpenGLEngineShaderManager* shaderManager;
      QOpenGLPaintDevice* device;

@@ -135,10 +135,10 @@ index 4f0e2e5..f211de1 100644
      QOpenGLContext *ctx;
      EngineMode mode;
 diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
-index 0610ab6..ea1e3b2 100644
+index 6e16b2d..ddec9bb 100644
 --- a/src/gui/opengl/qopengltextureglyphcache.cpp
 +++ b/src/gui/opengl/qopengltextureglyphcache.cpp
-@@ -316,7 +316,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
+@@ -308,7 +308,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
      funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
  
      if (pex != 0) {

@@ -148,5 +148,5 @@ index 0610ab6..ea1e3b2 100644
      } else {
          if (m_vao.isCreated()) {
 -- 
-2.0.2
+2.1.1
 

deleted file mode 100644
index da05f28..0000000
@@ -1,26 +0,0 @@
-From 8d8db9db8518289f4c1856dd3062c2e324c5c9be Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Wed, 4 Jun 2014 15:26:11 +0200
-Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf"
-
-This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489.
----
- mkspecs/features/simd.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf
-index 62a63f9..4f86f60 100644
---- a/mkspecs/features/simd.prf
-+++ b/mkspecs/features/simd.prf
-@@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
- #
- # Set up compilers for SIMD (SSE/AVX, NEON etc)
- #
--gcc {       # includes intel_icc and clang variants
-+*-g++*|intel_icc|*-clang*|*-qcc* {
-     sse2 {
-         HEADERS += $$SSE2_HEADERS
- 
--- 
-2.0.0
-

index a1af18e..9bd001b 100644
@@ -1,4 +1,4 @@
-From 271db04ebfbaf67e2e8c30ff050510c5a42acfa4 Mon Sep 17 00:00:00 2001
+From 2dd5a897d7e2f073b4223595a7bf214d3481b68a Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH 11/12] Always build uic

@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/src.pro b/src/src.pro
-index 6a805a6..90623a6 100644
+index ab93641..a48606b 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
+@@ -161,7 +161,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
          }
      }
  }

@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644
  nacl: SUBDIRS -= src_network src_testlib
  
 -- 
-2.0.0
+2.1.1
 

index 820fb21..e39693f 100644
@@ -1,4 +1,4 @@
-From ac507c953112630d7e929be35586e97396b76327 Mon Sep 17 00:00:00 2001
+From 5d6e6b18d2049bad370c594e5ab30fd85c0ed047 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <[email protected]>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
 Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build

@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 3c0347a..a75ca11 100755
+index fe6bed4..9628be2 100755
 --- a/configure
 +++ b/configure
-@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()
+@@ -3689,7 +3689,7 @@ setBootstrapEvalVariable()
  
  
  # build qmake

@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644
  VPATH += \
      ../src/corelib/global \
 -- 
-2.0.0
+2.1.1
 

index 81b05f3..c994120 100644
@@ -1,4 +1,4 @@
-From 11bd34bfe629767ec32a36593386ef0655e86f24 Mon Sep 17 00:00:00 2001
+From f1b4d7d4c96b6ded9bd312f6db2ba735feb001c0 Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Mon, 11 Nov 2013 20:22:34 -0500
 Subject: [PATCH 12/12] configure: preserve built qmake and swap with native

@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/configure b/configure
-index 3c0347a..c51f785 100755
+index fe6bed4..ea661a3 100755
 --- a/configure
 +++ b/configure
-@@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3839,6 +3839,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
  
      (cd "$outpath/qmake"; "$MAKE") || exit 2
  fi # Build qmake

@@ -26,5 +26,5 @@ index 3c0347a..c51f785 100755
  echo "Running configuration tests..."
  
 -- 
-2.0.0
+2.1.1
 

index 9a9d3ca..d902b18 100644
@@ -16,8 +16,7 @@ SRC_URI += "\
     file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
     file://0008-configure-bump-path-length-from-256-to-512-character.patch \
     file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
-    file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \
-    file://0011-QOpenGLPaintDevice-sub-area-support.patch \
+    file://0010-QOpenGLPaintDevice-sub-area-support.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase

@@ -31,4 +30,10 @@ do_install_append() {
     ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
 }
 
-SRCREV = "7a4dcbaabf037a6913a5662ebb74cc47e04673b9"
+SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03"
+
+LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

index 65e92a0..2e938c9 100644
@@ -16,8 +16,7 @@ SRC_URI += "\
     file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
     file://0008-configure-bump-path-length-from-256-to-512-character.patch \
     file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
-    file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \
-    file://0011-QOpenGLPaintDevice-sub-area-support.patch \
+    file://0010-QOpenGLPaintDevice-sub-area-support.patch \
 "
  
 # specific for qtbase

@@ -25,4 +24,10 @@ SRC_URI += "\
     file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
 "
 
-SRCREV = "7a4dcbaabf037a6913a5662ebb74cc47e04673b9"
+SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03"
+
+LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

index 7b81b2c..195b267 100644
@@ -1,4 +1,10 @@
 require qt5-git.inc
 require ${BPN}.inc
 
-SRCREV = "5fe214b8db0c192ea5520e7fdb20f546b02af88b"
+SRCREV = "0f6e9cc18007c718de8ec399f5b60687ecffe9c2"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

88 lines not on this page · raw message

index 4611a2d..5957c45 100644
@@ -1,4 +1,10 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "e6bf3d444f3818145d7807ad37b6a0ab9f8d4a47"
+SRCREV = "29b77e5e0759472ab1f7da1dd756b857d3b2ddd7"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

index b7f2f79..ff3c1c4 100644
@@ -1,4 +1,9 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "07885f25ed57b98a695f28337fc4b91e611991aa"
+QT_MODULE_BRANCH = "1.1"
+SRCREV = "2b93eb45116e0bf2cc62f614de66cfd261c552df"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"

index ef9cf50..95aac63 100644
@@ -1,4 +1,10 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "82abf6975b6737259ee656564e5ec7f8ad1d0508"
+SRCREV = "bdd7e47ff1357bcc3b81c7ff5c10189c6a9b0290"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

index 16e12bb..4f15caa 100644
@@ -1,4 +1,10 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "1c66c5786c35a7d841e0004757cff06da3f9a2cc"
+SRCREV = "08f40bc0f00716c3a8cbda70ed00dc2f16515e85"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

index 690cb46..38980b1 100644
@@ -1,4 +1,10 @@
 require qt5-git.inc
 require ${PN}.inc
 
-SRCREV = "f90f40de7006c4204df6aa414776616dc6f47f57"
+SRCREV = "b90e043af09955d94a7a9555f11b5d6f3add4c3a"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+                    file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
+                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

1,987 lines not on this page · raw message

53 lines not on this page · raw message

index 120ae1d..48cab35 100644

Lines of this file are not shown. View the raw message.

index 7cb29a6..873c359 100644

Lines of this file are not shown. View the raw message.

index 7f094b2..77b499a 100644

Lines of this file are not shown. View the raw message.

index a436915..029c107 100644

Lines of this file are not shown. View the raw message.

index 97a70ae..6e2a36a 100644

Lines of this file are not shown. View the raw message.

index 945a8d4..6d2ab1c 100644

Lines of this file are not shown. View the raw message.

index 9420ff8..118a099 100644

Lines of this file are not shown. View the raw message.

index c264ab0..45f6b0e 100644

Lines of this file are not shown. View the raw message.

index 9a31c13..c176b4e 100644

Lines of this file are not shown. View the raw message.

index eaf4694..1385791 100644

Lines of this file are not shown. View the raw message.

index fa3ac1a..ba96f5a 100644

Lines of this file are not shown. View the raw message.

index bf06b08..db3e540 100644

Lines of this file are not shown. View the raw message.

index bf06b08..db3e540 100644

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..e780810

Lines of this file are not shown. View the raw message.

index 761cfb6..7934955 100644

Lines of this file are not shown. View the raw message.

index bb52f0d..dc6be23 100644

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..bfbeab1

Lines of this file are not shown. View the raw message.

index 0bbb5ab..62a718e 100644

Lines of this file are not shown. View the raw message.

index 060faa7..397be70 100644

Lines of this file are not shown. View the raw message.

index 397929f..bd4e867 100644

Lines of this file are not shown. View the raw message.

index d9b75eb..b5fc71d 100644

Lines of this file are not shown. View the raw message.

index bc5a75c..173f7f7 100644

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..c9a6ea4

Lines of this file are not shown. View the raw message.

index dd93d1f..360a1c8 100644

Lines of this file are not shown. View the raw message.

index f0ceb5d..27dd7ee 100644

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..2c471be

Lines of this file are not shown. View the raw message.

index 30f2f7a..e54d397 100644

Lines of this file are not shown. View the raw message.

index ff13986..0631f56 100644

Lines of this file are not shown. View the raw message.

index fdb8094..6867e04 100644

Lines of this file are not shown. View the raw message.

index 5d63a6b..5c7246d 100644

Lines of this file are not shown. View the raw message.