Merge remote-tracking branch 'qtyocto/5.13' into 5.14

* qtyocto/5.13:
  3e50277 ogl-runtime: update to v2.5.0 release
  f7afa0a qt5: update submodules
  8eec885 qt5: update submodules
  6fca0e3 qtbase: add openssl PACKAGECONFIG for native nativesdk
  09f4a09 ogl-runtime: update to 2.5

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/ogl-runtime_git.bb
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtimageformats_git.bb
  recipes-qt/qt5/qtwebengine_git.bb

Change-Id: I4aeed4371949b449320ba153f8b7e45fb00c37e8

1 files changed, 1 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 5cd51c5d..04313397 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -59,6 +59,7 @@ XPLATFORM ?= "linux-oe-g++"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui,"
 PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
+PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl"
 
 QT_CONFIG_FLAGS = " \
     -sysroot ${STAGING_DIR_NATIVE} \
@@ -74,7 +75,6 @@ QT_CONFIG_FLAGS = " \
     -no-sql-psql \
     -no-opengl \
     -no-vulkan \
-    -no-openssl \
     -no-xcb \
     -no-icu \
     -verbose \