From f3570c1280d1fb9050da3e7955842d368175eae0 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Mon, 22 Feb 2016 12:49:19 +0200
Subject: qt5: update to latest revision of meta-qt5

meta-qt5 was updated and several patches were merged, remove unneeded
changes from bbappends.

Change-Id: Ia98eb0160d04eb469f8bc87394caa3da65c2f41a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
---
 recipes-qt/qt5/nativesdk-qtbase_git.bbappend |  5 -----
 recipes-qt/qt5/qt3d_git.bbappend             | 14 --------------
 recipes-qt/qt5/qtbase_git.bbappend           |  8 --------
 recipes-qt/qt5/qttranslations_git.bbappend   |  5 -----
 scripts/manifest.xml                         |  2 +-
 5 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index fd8a462..2a767e9 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -19,9 +19,4 @@
 ##
 ##############################################################################
 
-# Needed by qtxmlpatterns
-EXTRA_QTLIB_append = " Network Sql"
-# Needed by qttools
-EXTRA_QTLIB_append = " Xml"
-
 SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 59b6b33..079ddd5 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -26,17 +26,3 @@ SRC_URI_append_class-target = " \
     "
 
 SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7"
-
-DEPENDS += "qt3d-native"
-
-SRC_URI += " \
-    file://0001-Allow-a-tools-only-build.patch \
-    "
-PACKAGECONFIG ??= ""
-PACKAGECONFIG_class-native ??= "tools-only"
-PACKAGECONFIG_class-nativesdk ??= "tools-only"
-PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
-
-EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
-
-BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 65a9b1d..e312eaa 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -47,12 +47,4 @@ do_configure_prepend() {
 SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
 
 # Temporarily here, until merged upstream
-PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
-
-do_install_append() {
-    # Temporarily here, until merged upstream
-    sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \
-        -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
-        ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
-}
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index e8b1d19..5045c67 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -20,8 +20,3 @@
 ##############################################################################
 
 SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde"
-
-PACKAGES += "${PN}-qtwebengine"
-FILES_${PN}-qtwebengine = " \
-    ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \
-"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index b95a8dc..703aedc 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="72ac998cef3306e6e4d2f3760af1c21cedfc330f"
+           revision="ddbe177dae46353f08f7326a11d3b3fd5a1f8435"
            path="sources/meta-qt5"/>
 
   <project name="meta-mingw"
-- 
cgit v1.2.3-54-g00ecf