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

3 files changed, 3 insertions, 3 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index f83bd967..b7207e63 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -28,3 +28,4 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
 IMAGE_FEATURES[validitems] += "qtcreator-debug"
 
 QT_GIT ?= "git://github.com/qtproject"
+QT_GIT_PROTOCOL ?= "git"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 172a170e..f8fb38b7 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -6,7 +6,7 @@ QT_MODULE_BRANCH ?= "5.6"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
-    ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+    ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL} \
 "
 
 S = "${WORKDIR}/git"
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"