Set the list of submodules to those needed for Qbs

Change-Id: I8b4dc36d4b0a3af7eb393a4c7fd28b7db29989f2

.gitmodules

@@ -1,271 +1,11 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.6.3
+	branch = 5.6
 	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtsvg qtxmlpatterns
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 5.6.3
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 5.6.3
-	status = addon
 [submodule "qtscript"]
 	depends = qtbase
-	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.6.3
-	status = deprecated
-[submodule "qtmultimedia"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 5.6.3
+	branch = 5.6
 	status = essential
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt qtwebkit
-	path = qttools
-	url = ../qttools.git
-	branch = 5.6.3
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = 5.6.3
-	status = addon
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 5.6.3
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 5.6.3
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtwebkit"]
-	depends = qtbase
-	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
-	serialize = qtwebengine
-	path = qtwebkit
-	url = ../qtwebkit.git
-	branch = 5.6.3
-	status = obsolete
-	project = WebKit.pro
-	priority = 20
-[submodule "qtwebkit-examples"]
-	depends = qtwebkit qttools
-	path = qtwebkit-examples
-	url = ../qtwebkit-examples.git
-	branch = 5.6.3
-	status = obsolete
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = master
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtdocgallery"]
-	depends = qtdeclarative
-	path = qtdocgallery
-	url = ../qtdocgallery.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 5.6.3
-	status = addon
-[submodule "qt3d"]
-	depends = qtdeclarative qtimageformats
-	path = qt3d
-	url = ../qt3d.git
-	branch = 5.6.3
-	status = preview
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtquick1"]
-	depends = qtscript
-	recommends = qtsvg qtxmlpatterns
-	path = qtquick1
-	url = ../qtquick1.git
-	branch = 5.6.3
-	status = obsolete
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = 5.6.3
-	status = essential
-[submodule "qtserialbus"]
-	depends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 5.6.3
-	status = preview
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtx11extras"]
-	depends = qtbase
-	path = qtx11extras
-	url = ../qtx11extras.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtmacextras"]
-	depends = qtbase
-	path = qtmacextras
-	url = ../qtmacextras.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtwinextras"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtwinextras
-	url = ../qtwinextras.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtenginio"]
-	depends = qtdeclarative
-	path = qtenginio
-	url = ../qtenginio.git
-	branch = 5.6.3
-	status = deprecated
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtquickcontrols qtwebchannel
-	recommends = qtlocation
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 5.6.3
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 5.6.3
-	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtquickcontrols
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 5.6.3
-	status = preview
-[submodule "qtpurchasing"]
-	depends = qtbase qtandroidextras
-	recommends = qtdeclarative
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = dev
-	status = ignore

coin/platform_configs/default.txt

@@ -1,26 +1,10 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-8.1-x86_64                                             MSVC2012    DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8.1-x86_64                                 x86         MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-8.1-x86_64                                             MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-7-x86-2                                                MSVC2010    Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
 qtci-windows-7-x86-2                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
 qtci-windows-10-x86_64-8                                x86         MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
 qtci-windows-10-x86_64-8                                            MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
-qtci-windows-8.1-x86_64             Windows_Phone_8_1   armv4       MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-windows-8.1-x86_64             WinRT_8_1                       MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-linux-OpenSuSE-13.01-x86_64                                    GCC         DeveloperBuild NoPch
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Packaging Release NoUseGoldLinker
 qtci-osx-10.11-x86_64                                               Clang       Packaging DebugAndRelease Release
 qtci-osx-10.10-x86_64                                               Clang       DebugAndRelease Release DisableTests
 qtci-osx-10.9-x86_64                                                Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.8-x86_64                                                Clang       Release NoFramework
-qtci-osx-10.11-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
-qtci-linux-RHEL-6.6-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64-1    Boot2Qt_Fido        armv7       GCC         DisableTests
-qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         TestOnly LicenseCheck
-qtci-windows-7-x86-2                Windows_7_Embedded  armv4       MSVC2008    DeveloperBuild Release DisableTests OpenGLES2

coin/platform_configs/qt5.txt

@@ -1,17 +1,2 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -----------------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64     Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-windows-10-x86_64-8    WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-windows-10-x86_64-8    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-linux-RHEL-6.6-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-2        Android_ANY         armv7       Mingw49     Packaging Release DisableTests OpenGLES2 UploadConfigureExe
-qtci-windows-7-x86-2        Android_ANY         x86         Mingw49     Packaging Release DisableTests OpenGLES2 UploadConfigureExe
-qtci-osx-10.11-x86_64       Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
-qtci-osx-10.11-x86_64       Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-7    QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-7    QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
-# target arch is used here only for documentation the value is ignored
-qtci-windows-10-x86_64-8    WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-
-qtci-osx-10.11-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static

coin/provisioning/common/DownloadURL.sh

@@ -70,7 +70,8 @@ function DownloadURL {
             esac
         }
         echo "Checking SHA1 on PKG '$targetFile'"
-        echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
+        echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+        shasum --check $targetFile.sha1 || throw $ExceptionSHA1
     )
 
     catch || {

coin/provisioning/common/cmake.ps1

@@ -53,5 +53,7 @@ if((Test-Path -Path "C:\CMake" )){
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
 Rename-Item $defaultinstallfolder C:\CMake
 
+Add-Path "C:\CMake\bin"
+
 echo "CMake = $version" >> ~\versions.txt
 

coin/provisioning/common/helpers.ps1

@@ -69,6 +69,7 @@ function Download
         [string] $CachedUrl   = $(BadParam("the locally cached URL")),
         [string] $Destination = $(BadParam("a download target location"))
     )
+    $ProgressPreference = 'SilentlyContinue'
     try {
         if ($CachedUrl.StartsWith("http")) {
             Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
@@ -86,7 +87,9 @@ function Add-Path
         [string]$Path
     )
     echo "Adding $Path to Path"
-    [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine)
+
+    $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+    [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
 }
 
 function is64bitWinHost

coin/provisioning/common/install-ruby.ps1

@@ -55,7 +55,6 @@ cmd /c "$rubyPackage /silent"
 echo "Cleaning $rubyPackage.."
 Remove-Item -Recurse -Force "$rubyPackage"
 
-$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
-[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine)
+Add-Path "C:\Ruby22-x64\bin"
 
 echo "Ruby = $version" >> ~\versions.txt

coin/provisioning/common/python.ps1

@@ -59,8 +59,7 @@ echo "Chancing allowZip64 value to 'True'..."
 echo "Remove $package..."
 del $package
 
-$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
-[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine)
+Add-Path "C:\Python27;C:\Python27\Scripts"
 
 C:\Python27\python.exe -m ensurepip
 # Install python virtual env