qt5: upgrade to 5.2.0

* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
  resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
  resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
  resolved upstream in:
  commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
  Author: Jan Arne Petersen <jan.petersen@kdab.com>
  Date:   Fri Jul 19 14:35:19 2013 +0200
  Fix wayland-scanner to work with CONFIG+=silent

* squash to match more with structure of
  https://github.com/meta-qt5/qtbase/tree/stable

* qtmodules: bump SRCREVs for 5.2.0 tags
  now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
  include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
  fails to build without this
* qtjsbackend: remove for git versions
  Found in [1]:
  Qt Qml is now using its own built-in Javascript engine and does not depend on
  V8 anymore. As such the QtJSBackend shared library has disappeared.
  [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
  qtjsbackend is now completely gone
  it allows to share more .patch files and configuration in .inc again

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 15 insertions, 20 deletions

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index ffb37ce4..cd3a939c 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -1,29 +1,24 @@
 require qt5.inc
 
-SRC_URI += " \
+# common with -native
+SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
     file://0003-Add-external-hostbindir-option.patch \
-    file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
-    file://0005-qmake-is-already-built-in-qtbase-native.patch \
-    file://0006-Allow-building-a-separate-qmake-for-the-target.patch \
-    file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
-    file://0008-qt_module-Fix-pkgconfig-replacement.patch \
-    file://0009-qt_module-Fix-paths-in-.prl-files.patch \
-    file://0010-wayland-scanner-disable-silent-rules.patch \
-    file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
-    file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
-    file://0013-Disable-mkv8snapshot.patch \
+    file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+    file://0005-qt_module-Fix-pkgconfig-replacement.patch \
+    file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
+    file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
+    file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
+    file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
+"
+
+SRC_URI += "\
+    file://0010-qmake-is-already-built-in-qtbase-native.patch \
+    file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
+    file://0012-qtbase-allow-build-of-examples.patch \
+    file://0013-QOpenGLPaintDevice-sub-area-support.patch \
     file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
-    file://0015-qtbase-allow-build-of-examples.patch \
-    file://0018-QOpenGLPaintDevice-sub-area-support.patch \
-    file://0020-Use-BGRA-extension-in-bindTexture.patch \
-    file://0021-configure-make-pulseaudio-a-configurable-option.patch \
-    file://0022-configure-make-alsa-a-configurable-option.patch \
-    file://0023-configure-make-freetype-a-configurable-option.patch \
-    file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
-    file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
-    file://0027-Fix-misaligned-selection-region-with-text-when-cente.patch \
 "
 
 DEPENDS += "qtbase-native"