Merge remote-tracking branch 'origin/5.6.3' into 5.6
authorLiang Qi <liang.qi@qt.io>
Mon, 18 Sep 2017 07:20:32 +0000 (09:20 +0200)
committerLiang Qi <liang.qi@qt.io>
Mon, 18 Sep 2017 07:42:25 +0000 (09:42 +0200)
 Conflicts:
.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c

29 files changed:
.gitmodules
coin/provisioning/common/DownloadURL.sh
coin/provisioning/common/cmake.ps1
coin/provisioning/common/helpers.ps1
coin/provisioning/common/install-ruby.ps1
coin/provisioning/common/python.ps1
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtquickcontrols
qtsensors
qtserialbus
qtserialport
qttools
qtwayland
qtwebchannel
qtwebengine
qtwebsockets
qtwebview
qtx11extras
qtxmlpatterns

index 2acc9bf..9e39198 100644 (file)
@@ -1,66 +1,66 @@
 [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
+       branch = 5.6
        status = addon
 [submodule "qtdeclarative"]
        depends = qtbase
        recommends = qtsvg qtxmlpatterns
        path = qtdeclarative
        url = ../qtdeclarative.git
-       branch = 5.6.3
+       branch = 5.6
        status = essential
 [submodule "qtactiveqt"]
        depends = qtbase
        path = qtactiveqt
        url = ../qtactiveqt.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtscript"]
        depends = qtbase
        recommends = qttools
        path = qtscript
        url = ../qtscript.git
-       branch = 5.6.3
+       branch = 5.6
        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
+       branch = 5.6
        status = essential
 [submodule "qtxmlpatterns"]
        depends = qtbase
        path = qtxmlpatterns
        url = ../qtxmlpatterns.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qttranslations"]
        depends = qttools
        path = qttranslations
        url = ../qttranslations.git
-       branch = 5.6.3
+       branch = 5.6
        status = essential
        priority = 30
 [submodule "qtdoc"]
        depends = qtdeclarative
        path = qtdoc
        url = ../qtdoc.git
-       branch = 5.6.3
+       branch = 5.6
        status = essential
        priority = 40
 [submodule "qtrepotools"]
@@ -75,7 +75,7 @@
        serialize = qtwebengine
        path = qtwebkit
        url = ../qtwebkit.git
-       branch = 5.6.3
+       branch = 5.6
        status = obsolete
        project = WebKit.pro
        priority = 20
@@ -83,7 +83,7 @@
        depends = qtwebkit qttools
        path = qtwebkit-examples
        url = ../qtwebkit-examples.git
-       branch = 5.6.3
+       branch = 5.6
        status = obsolete
 [submodule "qtqa"]
        depends = qtbase
        recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
        path = qtlocation
        url = ../qtlocation.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtsensors"]
        depends = qtbase
        recommends = qtdeclarative
        path = qtsensors
        url = ../qtsensors.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtsystems"]
        depends = qtbase
        recommends = qtdeclarative qtandroidextras
        path = qtconnectivity
        url = ../qtconnectivity.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtwayland"]
        depends = qtbase
        recommends = qtdeclarative
        path = qtwayland
        url = ../qtwayland.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qt3d"]
        depends = qtdeclarative qtimageformats
        path = qt3d
        url = ../qt3d.git
-       branch = 5.6.3
+       branch = 5.6
        status = preview
 [submodule "qtimageformats"]
        depends = qtbase
        path = qtimageformats
        url = ../qtimageformats.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtquick1"]
        depends = qtscript
        recommends = qtsvg qtxmlpatterns
        path = qtquick1
        url = ../qtquick1.git
-       branch = 5.6.3
+       branch = 5.6
        status = obsolete
 [submodule "qtgraphicaleffects"]
        depends = qtdeclarative
        path = qtgraphicaleffects
        url = ../qtgraphicaleffects.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtquickcontrols"]
        depends = qtdeclarative
        recommends = qtgraphicaleffects
        path = qtquickcontrols
        url = ../qtquickcontrols.git
-       branch = 5.6.3
+       branch = 5.6
        status = essential
 [submodule "qtserialbus"]
        depends = qtserialport
        path = qtserialbus
        url = ../qtserialbus.git
-       branch = 5.6.3
+       branch = 5.6
        status = preview
 [submodule "qtserialport"]
        depends = qtbase
        path = qtserialport
        url = ../qtserialport.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtx11extras"]
        depends = qtbase
        path = qtx11extras
        url = ../qtx11extras.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtmacextras"]
        depends = qtbase
        path = qtmacextras
        url = ../qtmacextras.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtwinextras"]
        depends = qtbase
        recommends = qtdeclarative qtmultimedia
        path = qtwinextras
        url = ../qtwinextras.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtandroidextras"]
        depends = qtbase
        path = qtandroidextras
        url = ../qtandroidextras.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtenginio"]
        depends = qtdeclarative
        path = qtenginio
        url = ../qtenginio.git
-       branch = 5.6.3
+       branch = 5.6
        status = deprecated
 [submodule "qtwebsockets"]
        depends = qtbase
        recommends = qtdeclarative
        path = qtwebsockets
        url = ../qtwebsockets.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtwebchannel"]
        depends = qtbase
        recommends = qtdeclarative qtwebsockets
        path = qtwebchannel
        url = ../qtwebchannel.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtwebengine"]
        depends = qtquickcontrols qtwebchannel
        recommends = qtlocation
        path = qtwebengine
        url = ../qtwebengine.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
        priority = 10
 [submodule "qtcanvas3d"]
        depends = qtdeclarative
        path = qtcanvas3d
        url = ../qtcanvas3d.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtwebview"]
        depends = qtdeclarative
        recommends = qtwebengine
        path = qtwebview
        url = ../qtwebview.git
-       branch = 5.6.3
+       branch = 5.6
        status = addon
 [submodule "qtquickcontrols2"]
        depends = qtquickcontrols
        path = qtquickcontrols2
        url = ../qtquickcontrols2.git
-       branch = 5.6.3
+       branch = 5.6
        status = preview
 [submodule "qtpurchasing"]
        depends = qtbase qtandroidextras
index 305f267..c60fae2 100644 (file)
@@ -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 || {
index 50e2e82..8a94dc5 100644 (file)
@@ -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
 
index 3f7f0a6..b957603 100644 (file)
@@ -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
index 81b0134..57cf227 100644 (file)
@@ -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
index 0be96ee..c3eba2d 100644 (file)
@@ -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
index 6163101..dfb9f2c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6163101324d9bd7cef59c98efd584f7fd6b6230c
+Subproject commit dfb9f2cfd658860f69dd55363122a7c2c56b88fb
diff --git a/qtbase b/qtbase
index e6f8b07..40ca27e 160000 (submodule)
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit e6f8b072d2bf15f8b82bede48ff29ce8ac8dbd9a
+Subproject commit 40ca27e0d2107fd97b01bfb201cff408f7c5a0c3
index 8bbd832..61804e5 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 8bbd832997841927e0d8a433f4ec20c82cdea203
+Subproject commit 61804e56b82330fac0f29beec0e56262233467bb
index 12b5e35..f7bfd2a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 12b5e352c312a88518d6db34673350a70cd53616
+Subproject commit f7bfd2adb82e3a8797e168a37287510e4a004b2e
index bb01612..f724b53 160000 (submodule)
@@ -1 +1 @@
-Subproject commit bb01612a8809efd268903e41b9e3a17cff48f1c0
+Subproject commit f724b5380c911fbc841ff8ed4831dccd37fff6e9
diff --git a/qtdoc b/qtdoc
index c46e1a0..27f8830 160000 (submodule)
--- a/qtdoc
+++ b/qtdoc
@@ -1 +1 @@
-Subproject commit c46e1a02eefb6b4050ef0cbb4190d086813da315
+Subproject commit 27f883002b9fba6e5bbcbc84ad0d366fb8149808
index bf13dd5..4dc734d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit bf13dd5ca02d861c3a554743948c939a339d5061
+Subproject commit 4dc734d85f59e3a16a50a9d7ffebc7aa304f5243
index a7a998e..b6ffd71 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a7a998ee6e328babaa0edfee0d156fb28cf1b385
+Subproject commit b6ffd71e2315e699d4ad32859cf36c67635820e7
index 35348e8..0a38932 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 35348e80145305778a89923d3bfe50d7baba7690
+Subproject commit 0a38932510ffaad5387b7e86c7ca70aed8af5c5b
index 5aea592..9e98d9a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5aea592832ad6380b3eab91790b147b22cfdb922
+Subproject commit 9e98d9a6f56d1076ec9438b2b22f46ed0798273a
index 4dd780a..6d49481 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4dd780a81e886a8a5eb86d1a045716ac4194eba1
+Subproject commit 6d4948122063b651948a5c4db2197d633d7e96c4
index b66f6b0..9fc3fcb 160000 (submodule)
@@ -1 +1 @@
-Subproject commit b66f6b05c5f8024ddd9f8c46f33ccb618323999e
+Subproject commit 9fc3fcb5a827196dee8c7afbd70a4c2361c65107
index 099b3a7..12b98b6 160000 (submodule)
--- a/qtsensors
+++ b/qtsensors
@@ -1 +1 @@
-Subproject commit 099b3a7442a553aedf4d5bb8955dabcae4dae66c
+Subproject commit 12b98b6ff70a18c27f543dda029e75c197d8cbc5
index 21616f7..f5b1c3a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 21616f7bc1e7325d2cb04403388b8fdaeea99e21
+Subproject commit f5b1c3a32b2a7c9bc06b68c469981ae46fb7172e
index 2f7b253..9e4b9d2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 2f7b2533b323644289c60370f68492aea6b1a625
+Subproject commit 9e4b9d276f0de2d298da4ffdf6f15a9960402194
diff --git a/qttools b/qttools
index 56dbabb..705d06c 160000 (submodule)
--- a/qttools
+++ b/qttools
@@ -1 +1 @@
-Subproject commit 56dbabb7a64a4d416e8cf7b61e068208fd032355
+Subproject commit 705d06c2841ef5d9ebda954c112fc8f1e32ec2cb
index 7057564..d6f7bb3 160000 (submodule)
--- a/qtwayland
+++ b/qtwayland
@@ -1 +1 @@
-Subproject commit 70575643cfece4f0aca4b40e77ac5d7c0e8042a2
+Subproject commit d6f7bb39e71777ce5568d462841caccc17f3a205
index 065afc2..6430639 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 065afc22e9cc61364968aafc74ff2ca4524fab56
+Subproject commit 64306392ce3a7751bfb58e1352b212ad5cba8aec
index fad625e..04fa812 160000 (submodule)
@@ -1 +1 @@
-Subproject commit fad625e0ba39e855817bbf206ab9a846d07aeeec
+Subproject commit 04fa812ef5025aa991d9a79dd26e9ecfcb3182a1
index 65e7130..d303249 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 65e7130466963e0fd9cee8719d8b37c9fb15db35
+Subproject commit d3032491971e1cee8f1171f16b8e6d3d2fa42eed
index 6d9a88e..d399416 160000 (submodule)
--- a/qtwebview
+++ b/qtwebview
@@ -1 +1 @@
-Subproject commit 6d9a88e3048e230a3ee516c39bf55f714117869c
+Subproject commit d39941695dbc10b06188580b675f2b7c337ca505
index e33fc10..25e20a7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e33fc10fa49da17b297c53e44d109dc4d24c974a
+Subproject commit 25e20a724f411f6e07cd3dc9f4870298a308c2c3
index 5058228..0533f8b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 50582280b10fb1962b3bdfdd06a72ae1e0325049
+Subproject commit 0533f8ba47f57da5d7363c2c00cf0b239ce72888