diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-03 16:55:58 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-03 16:56:36 +0200 |
| commit | 53f534748a7f5427ade4f9a11f8b5f91798d8ed6 (patch) | |
| tree | 97c2db6e7332e1064ccfb384732d8b96c37cbad0 /recipes-qt/qt5/qtbase_git.bb | |
| parent | ff7fd3b1a9b39d217928f3e1d8f16341b9fd6fec (diff) | |
| parent | 4a0acfa4111600b7cb5ae7b16cd6bfa5df2e2123 (diff) | |
Merge remote-tracking branch 'origin/upstream/master' into master-mingw
* origin/upstream/master:
qtbase: use PACKAGECONFIG to ensure runtime dependency to libssl
qtbase: re-enable replacing host paths in qconfig.pri
qt5: allow overriding git protocol used with QT_GIT uri
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: Id0b67b6a30807501628c8ebfb6503bbd1cba9ca5
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 13a30c1c..62442bc9 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -121,8 +121,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" # needed for qtwebkit PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected -PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" PACKAGECONFIG[nis] = "-nis,-no-nis" |