Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:
  qtivi: Use the latest version from 'dev'
  python3-virtualenv: Add a recipe for python3-virtualenv
  python3: Remove the multilib patch
  qtivi: Add a PACKAGECONFIG option for dlt
  qtivi: Use the option of the new configure system
  qtivi: Restructure the recipe according to the OE style guide
  Fix qdb connection
  meta-qt5: update to Qt 5.9.1 RC3
  meta-qt5: update to Qt 5.9.1 RC2
  Enable sound on raspberrypi
  meta-qt5: update to Qt 5.9.1 RC
  rpi: update meta-raspberrypi layer to latest morty branch
  Use actual Qt version for upload location
  qbsp: use correct creator type names for qdb plugin
  meta-qt5: update to Qt 5.9.1

Change-Id: I612e758baf79552b6478b3b85bcbd389a43f95a6

2 files changed, 2 insertions, 2 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 4ea0f90..e7e6624 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -48,7 +48,7 @@
            groups="notdefault,external,ti"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="cce6292e41493158c26f5b1b7fded97faacf10d7"
+           revision="380bf2ff445c2049bdea15f3bb36e8cb36540345"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-intel"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 92256cb..cb94719 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,7 +31,7 @@
 set -x
 set -e
 
-RELEASE=5.10
+RELEASE=$(grep PV ../sources/meta-qt5/recipes-qt/qt5/qt5-git.inc | grep -o [0-9.]*)
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 UPLOADS="\
     tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \