lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 09:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
This commit is contained in:
Liang Qi
2018-08-30 09:50:50 +02:00
parent e89420945f 5a2a93ddf4
commit 1b65a5d73a
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/platform_configs/default.txt
View File

@@ -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

3
coin/platform_configs/qt5.txt
View File

@@ -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

4
coin/provisioning/common/linux/qnx_660.sh
View File

@@ -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"

4
coin/provisioning/common/linux/qnx_700.sh
View File

@@ -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"

2
coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
View File

@@ -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"

4
coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
View File

@@ -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"

4
qt.pro
View File

@@ -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