Merge remote-tracking branch 'origin/thud' into warrior

* origin/thud:
  8e216854 qtapplicationmanager: add support for native build
  64c5c552 meta-qt5: update layer
  65135569 ogl-runtime: remove obsolete patching
  84e2fdf9 meta-qt5: update layer

Conflicts:
  meta-boot2qt-distro/conf/distro/include/raspberrypi4.conf
  scripts/manifest.xml

Change-Id: I1d870a2cb3505c34c1a0f3ad941b7630cae10bc1

meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend

@@ -36,8 +36,6 @@ SRC_URI += "\
 PACKAGECONFIG += "openssl gui imageformats"
 PACKAGECONFIG_remove_mingw32 += "openssl"
 
-PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
-
 fakeroot do_generate_qt_environment_file_mingw32() {
 }
 

meta-boot2qt-distro/recipes-qt/qt5/qtbase-native_git.bbappend

@@ -29,7 +29,8 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
 
-PACKAGECONFIG += "gui imageformats"
+PACKAGECONFIG += "openssl gui imageformats"
+PACKAGECONFIG_remove_mingw32 += "openssl"
 
 SRC_URI += "\
     file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \

meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb

@@ -39,8 +39,7 @@ SRCREV = "3bc3dc4c8e912beb18aec7ab84af40c0129d84c0"
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}"
 
-RDEPENDS_${PN} = "libcrypto ${PN}-tools"
-RDEPENDS_${PN}_remove_mingw32 = "libcrypto"
+RDEPENDS_${PN}_class-target = "libcrypto ${PN}-tools"
 
 EXTRA_QMAKEVARS_PRE += "\
     ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "-config force-multi-process", "-config force-single-process", d)} \
@@ -58,7 +57,7 @@ FILES_${PN} += "\
     /opt/am \
     "
 
-BBCLASSEXTEND += "nativesdk"
+BBCLASSEXTEND += "nativesdk native"
 
 # nativesdk-qtdeclarative is added only to make build deterministic, can be removed once
 # there is a configure option to disable its usage.
@@ -68,3 +67,6 @@ DEPENDS_class-nativesdk_remove_mingw32 = "nativesdk-glibc-locale nativesdk-libar
 EXTRA_QMAKEVARS_PRE_class-nativesdk = "\
     -config tools-only \
     "
+EXTRA_QMAKEVARS_PRE_class-native = "\
+    -config tools-only \
+    "