Merge remote-tracking branch 'qtyocto/upstream/master' into 5.8

Conflicts:
	classes/qmake5_base.bbclass
	recipes-qt/qt5/nativesdk-qtbase_git.bb
	recipes-qt/qt5/qtbase_git.bb
	recipes-qt/qt5/qtwayland-native_git.bb
	recipes-qt/qt5/qtwayland_git.bb

Change-Id: I4d383e069efb8f64b7469e414ab368c9ca0ff1ad

1 files changed, 8 insertions, 1 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index b7207e63..7eb3b2db 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -23,9 +23,16 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
 
 BBFILE_PRIORITY_qt5-layer = "7"
 
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_qt5-layer = "1"
+
+LAYERDEPENDS_qt5-layer = "core"
+
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
 IMAGE_FEATURES[validitems] += "qtcreator-debug"
 
-QT_GIT ?= "git://github.com/qtproject"
+QT_GIT ?= "git://github.com/qt"
+QT_LABS_GIT ?= "git://github.com/qt-labs"
 QT_GIT_PROTOCOL ?= "git"