Merge remote-tracking branch 'origin/5.11' into 5.12

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098

7 files changed, 13 insertions, 14 deletions

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 7ac4037a..b0e9e210 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -17,9 +17,9 @@ qtci-macos-10.12-x86_64-8                                           Clang
 qtci-macos-10.13-x86_64                                             Clang       DebugAndRelease Release
 qtci-macos-10.12-x86_64-8                                           Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-macos-10.12-x86_64-8                                           Clang       Release NoFramework DisableTests
-qtci-macos-10.13-x86_64             IOS_ANY             multi       Clang       Release DisableTests Static
-qtci-macos-10.13-x86_64             TvOS_ANY            multi       Clang       Release DisableTests
-qtci-macos-10.13-x86_64             WatchOS_ANY         multi       Clang       Release DisableTests
+qtci-macos-10.13-x86_64             IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.13-x86_64             TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
+qtci-macos-10.13-x86_64             WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
 qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       Clang       Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-18.04-x86_64      QEMU                armv7       GCC         Release
 qtci-linux-Ubuntu-18.04-x86_64      QEMU                arm64       GCC         Release
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 980b1323..f9979818 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -13,9 +13,6 @@ qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Packagin
 qtci-macos-10.12-x86_64-8   Android_ANY         armv7       Clang       Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   Android_ANY         x86         Clang       Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-macos-10.13-x86_64     IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.13-x86_64     TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
-qtci-macos-10.13-x86_64     WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
 qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73     Packaging Release DisableTests OpenGLES2
diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh
index 7f6ab063..2add6901 100755
--- a/coin/provisioning/common/linux/qnx_660.sh
+++ b/coin/provisioning/common/linux/qnx_660.sh
@@ -40,8 +40,8 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz"
-sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz"
+sha1="ffcf91489699c42ce9c1d74941f1829531752bbe"
 folderName="qnx660"
 targetFile="qnx660.tar.gz"
 wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh
index 49fb7243..3c821fec 100755
--- a/coin/provisioning/common/linux/qnx_700.sh
+++ b/coin/provisioning/common/linux/qnx_700.sh
@@ -41,8 +41,8 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
-sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz"
+sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c"
 folderName="qnx700"
 targetFile="qnx700.tar.xz"
 wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
index a645fe56..38fb6103 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
@@ -36,7 +36,7 @@
 # This script installs QNX 7.
 
 targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip"
+sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20180801-macos.zip"
 folderName="qnx700"
 
 sudo mkdir -p "$targetFolder"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
index 821c513e..74c8dc6b 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -36,10 +36,10 @@
 # This script installs QNX SDP 7.0
 
 $zip = Get-DownloadLocation "qnx700.7z"
-$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z"
+$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z"
 
 Download $url $url $zip
-Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7"
+Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6"
 Extract-7Zip $zip C:\
 
 Set-EnvironmentVariable "QNX_700" "C:\QNX700"
diff --git a/qt.pro b/qt.pro
index af16c6df..9ce0a694 100644
--- a/qt.pro
+++ b/qt.pro
@@ -1,5 +1,7 @@
 # Create the super cache so modules will add themselves to it.
-cache(, super)
+# Also suppress the license check on subsequent "visits". The first
+# visit will skip it anyway due to not having a compiler set up yet.
+cache(CONFIG, add super, $$list(QTDIR_build))
 
 TEMPLATE      = subdirs