1 files changed, 8 insertions, 0 deletions

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 92e75aa..cc15776 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -75,11 +75,19 @@ if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
 
   mkdir -p ${PWD}/${BUILDDIR}/conf
   cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIR}/conf/bblayers.conf
+
+  if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then
+    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../)
+  fi
 fi
 
 export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"
 . sources/poky/oe-init-build-env ${BUILDDIR}
 
+# use sources from Qt SDK if that is available
+sed -i -e "/QT_SDK_PATH/s:\"\":\"${QT_SDK_PATH}\":" conf/local.conf
+
+unset QT_SDK_PATH
 unset BUILDDIR
 unset TEMPLATECONF
 unset LAYERSCONF