diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-03 20:24:29 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-03 20:26:23 +0200 |
| commit | 1a23e785527f4beeaaef54ab0c60da8f1f739117 (patch) | |
| tree | 6e3ea7132cb2ca1f65470eeb23366c2c27e1607d /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | 39aeb5d1b01f047afa0c8223b889ea045b4c5d94 (diff) | |
| parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
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
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2a50ff38..59fa8dd6 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -77,6 +77,7 @@ DEBIAN_NOAUTONAME_${PN} = "1" 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,libssl" QT_CONFIG_FLAGS += " \ -shared \ @@ -111,7 +112,6 @@ do_configure() { -no-sql-mysql \ -no-sql-sqlite \ -no-opengl \ - -no-openssl \ -no-xcb \ -no-feature-bearermanagement \ -no-icu \ |