- update Qt5 hash

- use stable branch instead of master branch for Qt5 modules
- remove unnecessary modules
- add non-Qt5 modules (qt3d,qtlocation,qtsensors) with latest
  hashes to make deviceorientation and geolocation tests work

build-qt5-env

@@ -1,3 +1,7 @@
-QT_WEEKLY_REV=r39
-WEEKLY_QT5_HASH="71c071399ad74325e2997980f6416a962b92e932"
-QT5_MODULES="qtjsbackend qtxmlpatterns qtscript qtquick1 qtdeclarative qt3d qtsensors qtlocation"
+QT_WEEKLY_REV=r40
+WEEKLY_QT5_HASH="8d77ff1ef2422259dd6baed5cae9815260e5bee2"
+QT5_MODULES="qtjsbackend qtdeclarative"
+NON_QT5_MODULES="qt3d qtlocation qtsensors"
+qt3d_HASH="1ce13f86c7066721ce80258d6a89baccc4030066"
+qtlocation_HASH="1e8989fcb10f04daf5ec1c21d36e829dfbde62ec"
+qtsensors_HASH="a199068d2aecd8a7faaed3e098253b6e6c542e59"

build-qt5.sh

@@ -67,14 +67,22 @@ else
 fi
 
 if [ ! -d qt5 ]; then
-    git clone $MIRROR_URL"/qt/qt5.git" qt5
+    git clone -b stable $MIRROR_URL"/qt/qt5.git" qt5
 fi
 
+for module in $NON_QT5_MODULES
+do
+  if [ ! -d qt5/$module ]; then
+    git clone -b master $MIRROR_URL"/qt/"$module".git" qt5/$module
+  fi
+done
+
+
 cd qt5
-git checkout master
+git checkout stable
 git clean -dxf
 git reset --hard HEAD
-git submodule foreach "git checkout master"
+git submodule foreach "git checkout stable"
 git submodule foreach "git clean -dxf"
 git submodule foreach "git reset --hard HEAD"
 git fetch || exit 1
@@ -86,6 +94,16 @@ echo ==========================================================
 git submodule status
 echo ==========================================================
 
+for module in $NON_QT5_MODULES
+do
+  module_hash="${module}_HASH"
+  cd $module && git checkout master && git clean -dxf && git reset --hard HEAD && git checkout ${!module_hash} && cd ..
+  if [ $? -ne 0 ] ; then
+    echo FAIL: updating $module
+    exit 1
+  fi
+done
+
 export QTDIR=$NEW_QTDIR
 export PATH=$QTDIR/bin:$PATH
 
@@ -97,7 +115,7 @@ if [ $? -ne 0 ] ; then
   exit 1
 fi
 
-for module in $QT5_MODULES
+for module in $QT5_MODULES $NON_QT5_MODULES
 do
   cd $module && qmake && make $THREADS && if [ ! $DEVELOPER_BUILD ]; then make install; fi && cd ..
   if [ $? -ne 0 ] ; then