From c253d71a062a39927b0f54565db8230d76862c6a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 13 Apr 2017 20:12:37 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtqa | 2 +- qttools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index a647004d..1936d0cf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a647004d9f349e0edc4254dcfe672ccf18f98ea7 +Subproject commit 1936d0cf5bac6cd3bf62f3e8995cbfed98650155 diff --git a/qtqa b/qtqa index cdd49851..b8198f71 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cdd49851abf4aed4f960c4d7cef6c3bd08d5a961 +Subproject commit b8198f71d579f488d18e0bb7ef72c10f6a861ef6 diff --git a/qttools b/qttools index d8e6c1e5..64e99958 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d8e6c1e55d311afb6a0e37cb4d54ad51dec221da +Subproject commit 64e99958f358003092cdf455eec89c08cf3b6fd1 -- cgit v1.2.1 From c6189f9723396c484658890d62816b95f91432fd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 21 Apr 2017 20:11:40 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 1936d0cf..50d9ee2a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1936d0cf5bac6cd3bf62f3e8995cbfed98650155 +Subproject commit 50d9ee2a4fd8d7b507370043a8deb97c108913ae diff --git a/qtdeclarative b/qtdeclarative index aebb0f69..f76dd50d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aebb0f69502a38262ae57cc905efbe5fdc315f9a +Subproject commit f76dd50d42b91234dcb7c0ea0775382e369f11ae diff --git a/qttranslations b/qttranslations index e925ae19..e0ee24ef 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e925ae199008908b971f02335acec41e3ebd80a2 +Subproject commit e0ee24efee5472d353accb70fa86274bc34a34db diff --git a/qtwebengine b/qtwebengine index 56edd178..cc113790 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 56edd178fc31f43297fcbd503edcba1dd5d9e6e8 +Subproject commit cc11379001a1a11e4d10709d5e83161d3260f98f diff --git a/qtxmlpatterns b/qtxmlpatterns index 9882c2d2..0533f8ba 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9882c2d27dd71e074d1c8a52a95e6f616014092e +Subproject commit 0533f8ba47f57da5d7363c2c00cf0b239ce72888 -- cgit v1.2.1 From 3ea073ada141164ed2999c142439fe86a220615e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 12 Apr 2017 13:38:02 +0200 Subject: ignore submodules in dirtiness check changed submodule sha1s should not prevent updating. Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b Reviewed-by: Simon Hausmann Reviewed-by: Edward Welbourne --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 861511b9..11a75ffd 100755 --- a/init-repository +++ b/init-repository @@ -469,7 +469,7 @@ sub git_stat_one_submodule my $orig_cwd = getcwd(); chdir($submodule) or confess "chdir $submodule: $OS_ERROR"; - my @sts = qx(git status --porcelain --untracked=no); + my @sts = qx(git status --porcelain --untracked=no --ignore-submodules=all); # After a git clone --no-checkout, git status reports all files as # staged for deletion, but we still want to update the submodule. -- cgit v1.2.1 From 370fdfcefdee8b5f4103caeb199272b3b0b957a2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 19 Apr 2017 12:23:20 +0300 Subject: Provisioning: MSVC 2017 Build Tools MSVC 2017 build tools are pre-provisioned to windows 10 templates Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 +- coin/platform_configs/qt5.txt | 6 +-- .../06-msvc_2017_build_tools.ps1 | 48 ++++++++++++++++++++++ .../06-msvc_2017_build_tools.ps1 | 48 ++++++++++++++++++++++ 4 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ae173eb7..917a8323 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -6,8 +6,8 @@ qtci-windows-8-x86-2 MSVC2013 qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86-4 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64-5 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86-5 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0494e964..77e98693 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-5 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-6 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-6 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests 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 qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packagin qtci-windows-7-x86-2 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-5 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-6 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 new file mode 100644 index 00000000..556a352f --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 @@ -0,0 +1,48 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Visual Studio 2017 Build Tools +# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 + +$version = "2017_version_15.0" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" +$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" +$msvcPackage = "C:\Windows\Temp\$version.exe" + +Download $url_cache $url_cache $msvcPackage +Verify-Checksum $msvcPackage $sha1 +cmd /c "$msvcPackage --all --passive --wait" +echo "Cleaning $msvcPackage.." +Remove-Item -Recurse -Force "$msvcPackage" +echo "Visual Studio Build Tools = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 new file mode 100644 index 00000000..556a352f --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 @@ -0,0 +1,48 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Visual Studio 2017 Build Tools +# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 + +$version = "2017_version_15.0" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" +$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" +$msvcPackage = "C:\Windows\Temp\$version.exe" + +Download $url_cache $url_cache $msvcPackage +Verify-Checksum $msvcPackage $sha1 +cmd /c "$msvcPackage --all --passive --wait" +echo "Cleaning $msvcPackage.." +Remove-Item -Recurse -Force "$msvcPackage" +echo "Visual Studio Build Tools = $version" >> ~\versions.txt -- cgit v1.2.1 From 2ea45a59a72402ba65cb484020576aa12a610038 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 24 Apr 2017 10:34:21 +0200 Subject: Improve Android SDK/NDK installation on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove unused installation on macOS 10.10 as we only build packages on 10.11. * Replace the use of the ~1GB downloads of the zip files with a direct extraction via NFS. This is more resilient to flakyness in the network connection. Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-osx-10.10-x86_64/android.sh | 102 --------------------- coin/provisioning/qtci-osx-10.11-x86_64/android.sh | 31 ++----- 2 files changed, 10 insertions(+), 123 deletions(-) delete mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/android.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/android.sh b/coin/provisioning/qtci-osx-10.10-x86_64/android.sh deleted file mode 100644 index 559eabd6..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/android.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install Android sdk and ndk. - -# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and - build-tools - -# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. - -set -e -targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.ci.local/input/android" - -# SDK -sdkVersion="android-sdk_r24.4.1-macosx.zip" -sdkBuildToolsVersion="24.0.2" -sdkApiLevel="android-18" -sdkUrl="$baseUrl/$sdkVersion" -sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd" -sdkTargetFile="$targetFolder/$sdkVersion" -sdkExtract="unzip $sdkTargetFile -d $targetFolder" -sdkFolderName="android-sdk-macosx" -sdkName="sdk" - -# NDK -ndkVersion="android-ndk-r10e-darwin-x86_64.zip" -ndkUrl="$baseUrl/$ndkVersion" -ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" -ndkTargetFile="$targetFolder/$ndkVersion" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-r10e" -ndkName="ndk" - -function InstallAndroidPackage { - targetFolder=$1 - version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 - - sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times" - shasum $targetFile |grep $sha1 || echo "shasum check failed !" - sudo chmod 755 $targetFile - sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:wheel $targetFolder/$folderName - sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" - sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version" -} - -sudo mkdir $targetFolder -# Install Android SDK -echo "Installing Android SDK version $sdkVersion..." -InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName - -# Install Android NDK -echo "Installing Android NDK version $ndkVersion..." -InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName - -# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools -echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" - -# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 -# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. -echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh index 559eabd6..da37ad52 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh @@ -43,55 +43,44 @@ set -e targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.ci.local/input/android" +basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android" # SDK sdkVersion="android-sdk_r24.4.1-macosx.zip" sdkBuildToolsVersion="24.0.2" sdkApiLevel="android-18" -sdkUrl="$baseUrl/$sdkVersion" -sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd" -sdkTargetFile="$targetFolder/$sdkVersion" -sdkExtract="unzip $sdkTargetFile -d $targetFolder" +sdkSourceFile="$basePath/$sdkVersion" +sdkExtract="unzip $sdkSourceFile -d $targetFolder" sdkFolderName="android-sdk-macosx" sdkName="sdk" # NDK ndkVersion="android-ndk-r10e-darwin-x86_64.zip" -ndkUrl="$baseUrl/$ndkVersion" -ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" -ndkTargetFile="$targetFolder/$ndkVersion" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkSourceFile="$basePath/$ndkVersion" +ndkExtract="unzip $ndkSourceFile -d $targetFolder" ndkFolderName="android-ndk-r10e" ndkName="ndk" function InstallAndroidPackage { targetFolder=$1 version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 + extract=$3 + folderName=$4 + name=$5 - sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times" - shasum $targetFile |grep $sha1 || echo "shasum check failed !" - sudo chmod 755 $targetFile sudo $extract || echo "Failed to extract $url" sudo chown -R qt:wheel $targetFolder/$folderName sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" - sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version" } sudo mkdir $targetFolder # Install Android SDK echo "Installing Android SDK version $sdkVersion..." -InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName +InstallAndroidPackage $targetFolder $sdkVersion "$sdkExtract" $sdkFolderName $sdkName # Install Android NDK echo "Installing Android NDK version $ndkVersion..." -InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName +InstallAndroidPackage $targetFolder $ndkVersion "$ndkExtract" $ndkFolderName $ndkName # run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -- cgit v1.2.1 From c3d2bd97bf7e7fac28f938a67fa367ed15b32585 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 25 Apr 2017 13:36:05 +0300 Subject: Add provisioning for qt3dstudio 3rdparty tools Change-Id: I8060b6fd89e4c188d17219f43c8789aa25713068 Reviewed-by: Simon Hausmann --- coin/provisioning/common/3dstudio_3rdparty.ps1 | 10 ++++++++++ coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 | 1 + 2 files changed, 11 insertions(+) create mode 100644 coin/provisioning/common/3dstudio_3rdparty.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/3dstudio_3rdparty.ps1 new file mode 100644 index 00000000..36816438 --- /dev/null +++ b/coin/provisioning/common/3dstudio_3rdparty.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" + +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip +Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1" +Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty +Remove-Item $zip + +[Environment]::SetEnvironmentVariable("QT3DSTUDIO_3RDPARTY_DIR", "C:/Utils/Qt3DStudio3rdparty", "Machine") diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 new file mode 100644 index 00000000..3bc58072 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1" -- cgit v1.2.1 From fb67cd8ef0b6a0efa4c48a6855f7d27edd98b4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 25 Apr 2017 09:48:16 +0300 Subject: Provision: Remove excess export that wasn't read in Ubuntus Default shell for 'qt' user is Dash. It doesn't read .bashrc at all. Coin uses bash, but uses it non-interactively which in .bashrc means that it bails out immediately. So same result, .bashrc isn't read in Ubuntus. Change-Id: Id466c86f8cc813aacd5f41c4b267b44e93759377 Reviewed-by: Sami Nurmenniemi Reviewed-by: Simon Hausmann --- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh index 1881ae0b..2498e441 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh @@ -44,7 +44,6 @@ ExceptionGsettings1=100 ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 -ExceptionDISPLAY=104 try ( @@ -57,8 +56,6 @@ try echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS - echo "Set DISPLAY" - echo 'export DISPLAY=":0"' >> ~/.bashrc || throw $ExceptionDISPLAY ) catch || { case $ex_code in @@ -78,10 +75,6 @@ catch || { echo "Failed to set network teset server address into /etc/hosts." exit 1; ;; - $ExceptionDISPLAY) - echo "Failed to set DISPLAY into ~/.bashrc." - exit 1; - ;; esac } -- cgit v1.2.1 From ed39e440a92552c229a038cc5bd1f3b46bb22138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 24 Apr 2017 12:26:30 +0300 Subject: Provision environment variables for SSL autotests Task-number: QTBUG-56102 Change-Id: I7f14fbebcc459b4610ca9469b4335ef5b18ba5b4 Reviewed-by: Jake Petroules Reviewed-by: Timur Pocheptsov --- coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh | 3 +++ 2 files changed, 6 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh new file mode 100755 index 00000000..61406203 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# Enables the usage of temporary keychains for SSL autotests +echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh new file mode 100755 index 00000000..61406203 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# Enables the usage of temporary keychains for SSL autotests +echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc -- cgit v1.2.1 From 94e22fcd94f94697984263e2e5b018d05085f535 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Wed, 12 Apr 2017 15:30:43 +0300 Subject: Add preparing of qemu fontconfig to Ubuntu 16.04 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If normal fontconfig paths are used, qemu parses what ever files it finds from the toolchain sysroot and the rest from the system fonts. Fix by copying the system font configurations to a location which prefix that can't be found from the toolchain sysroot. Links must also be dereferenced or their targets remain pointing to the toolchain sysroot. Task-number: QTBUG-59966 Change-Id: I9710c9fdebe81114080f47f1f59b2a049f87c070 Reviewed-by: Simon Hausmann Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh index f978003b..9c906562 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh @@ -64,3 +64,15 @@ sudo update-binfmts --package qemu-arm --install arm \ # doesn't help since host version creates cache for a wrong architecture and running # armv7 fc-cache segfaults on QEMU. sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk + +# If normal fontconfig paths are used, qemu parses what ever files it finds from +# the toolchain sysroot and the rest from the system fonts. Fix by copying the +# system font configurations to a location which prefix that can't be found from +# the toolchain sysroot. Links must also be dereferenced or their targets remain +# pointing to the toolchain sysroot. +QEMU_FONTCONFPATH=~/qemu_fonts +QEMU_FONTCONFFILE=$QEMU_FONTCONFPATH/fonts.qemu.conf +mkdir -p $QEMU_FONTCONFPATH +cp -Lr /etc/fonts/* $QEMU_FONTCONFPATH +sed $QEMU_FONTCONFPATH/fonts.conf -e "s:conf.d:$QEMU_FONTCONFPATH/conf.d:" > $QEMU_FONTCONFFILE +echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile -- cgit v1.2.1 From e0764f873b36d59b0ac8e0cbdfc7122d35db7045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 22 Mar 2017 12:22:39 +0200 Subject: Provision and take QNX 7 SDP into use with RHEL 7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After enabling QNX 7, we are moving some QNX 6.6 config to be ran with qt5 integration only. Task-number: QTQAINFRA-1111 Change-Id: I230b5f8b8631558ccfa156ae4f949ed045c40972 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 2 + .../qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh | 64 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 84a8b113..7dc33b49 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,5 +22,5 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DisableTests -qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64 GCC TestOnly LicenseCheck +qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 44418c0e..25472f88 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -7,6 +7,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packagin qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 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-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh new file mode 100644 index 00000000..8a38c054 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh @@ -0,0 +1,64 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs QNX 7. + +set -e +targetFolder="/opt/" +sourceFile="http://ci-files01-hki.ci.local/input/qnx/qnx700.tar.xz" +sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" +folderName="qnx700" +targetFile="qnx700.tar.xz" +wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" || echo "Failed to download '$url' multiple times" +echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" +if [ ! -d "$targetFolder" ]; then + mkdir -p $targetFolder +fi +if [ -d "$targetFolder/$folderName" ]; then + rm -rf $targetFolder/$folderName +fi +sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile" +sudo chown -R qt:users "$targetFolder"/"$folderName" + +# Verify that we have last file in tar +if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then + echo "Installation failed!" + exit -1 +fi + +rm -rf $targetFile +# Set env variables +echo 'export QNX_700=$targetFolder/$folderName' >> ~/.bashrc +echo "QNX SDP = 7.0.0" >> ~/versions.txt -- cgit v1.2.1 From f436db11bb05fbc8f5d86a5826d2a51fff1bf727 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 27 Apr 2017 16:39:16 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: Id118e3a91f3ac21c01823227a17075a208202bdd Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qt3d b/qt3d index a2b7483f..9b478e91 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a2b7483fa18e109011246fba5e7963338a77af56 +Subproject commit 9b478e9179522315ea53fe10ec1278a1f77753f8 diff --git a/qtactiveqt b/qtactiveqt index dfc34ee5..b0c50bc1 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit dfc34ee575ca7790ec403c6510a9ccc469c07997 +Subproject commit b0c50bc1e89085c1f8f9f311d4eaa6802a15168c diff --git a/qtbase b/qtbase index b1131074..11e37a0e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b1131074199aae97b2a005cba871f6baf2a32c63 +Subproject commit 11e37a0e8c9e2c17d13b1ab44ca9b3f35b7a9844 diff --git a/qtcanvas3d b/qtcanvas3d index 08458d0d..6717956e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 08458d0dcfba8421c03ed9c7dec7435619f0b70d +Subproject commit 6717956ed4b886defbb158b46b6ab572984c0891 diff --git a/qtcharts b/qtcharts index cc4e79d6..25e51976 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cc4e79d6200b0495a5c4d1a7faa773906b1ac99e +Subproject commit 25e51976c3324630525346ccb785fafe48ea5ed9 diff --git a/qtconnectivity b/qtconnectivity index 5391a325..731c202e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5391a325eadcee86a494aa96a3f8edae1be55556 +Subproject commit 731c202e13e74d0b97d9a5fcfb028b1ce1bf735d diff --git a/qtdatavis3d b/qtdatavis3d index 73ec35fa..d58ec762 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 73ec35fa12a4b150670ea93d3021ca8e658063e1 +Subproject commit d58ec7629ba79058f8b7a27be3c6fb2947f5a017 diff --git a/qtdeclarative b/qtdeclarative index 93bc4113..0757777f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 93bc4113f06dce4c942374d765bef20054cd1f94 +Subproject commit 0757777f196647e04c6813f0347179437fdc4812 diff --git a/qtdoc b/qtdoc index f1555216..aedbb438 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f155521639b9970effddca1244b98558ed4db70b +Subproject commit aedbb438e365f8eca29f363c02e09c54c50ccbfb diff --git a/qtgamepad b/qtgamepad index 36846eca..015add9d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 36846eca9ae810d213b2fe2ae5d9ff11137d4597 +Subproject commit 015add9d0887601845787d60ce1d6af635861b23 diff --git a/qtimageformats b/qtimageformats index c7a6a451..2dae7743 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c7a6a451a5c277556e28dfb3b4b943719cdda7ff +Subproject commit 2dae77433f2820abd352d1bb696bee63d787eb99 diff --git a/qtlocation b/qtlocation index c2691cf4..f3a004e5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c2691cf479c88ba0f74492195912cd9b62ce4e62 +Subproject commit f3a004e55a4731dde881c7a8e47f0720275b9185 diff --git a/qtmacextras b/qtmacextras index a26ed957..3d3ca5a1 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a26ed9570c95f2315a2fc0b0f58d2cfebe955a00 +Subproject commit 3d3ca5a13c6a35883f5bfa3175a8f1ae00dfaa0d diff --git a/qtmultimedia b/qtmultimedia index 6b20032d..9dbdd5db 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6b20032d91067e06f6ab5d4acf553812134236c7 +Subproject commit 9dbdd5db797fccb8932f49d7380fb5f5eda12cf2 diff --git a/qtquickcontrols b/qtquickcontrols index ffc1cab2..b70d45d3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ffc1cab21ade6fc4b0ab574dbb5507c677d32841 +Subproject commit b70d45d3f3e8096fb88c5cee1cf1f0b6e7c15f34 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7faafa47..52ea821c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7faafa470eee71c51255e276e7b9df5beed2dd5b +Subproject commit 52ea821c43dfd6afc9ad21a9066c1eb39937c40d diff --git a/qtremoteobjects b/qtremoteobjects index 2b6c91ff..f0487407 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2b6c91ff99401305a38687ae252d70c5227d293a +Subproject commit f0487407a00f542f88aff0d00c0a0ce7d4b24f21 diff --git a/qtserialbus b/qtserialbus index 0ac7bc6e..f9cd9f7d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0ac7bc6e57be2a7c2ee14bfaf7489e20daf3edc0 +Subproject commit f9cd9f7da643274e0c39fd62b8b12a6a83fc203d diff --git a/qtserialport b/qtserialport index d320f010..d88ded29 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d320f01018f0273e4fea2e0a7aa8f30ee8129587 +Subproject commit d88ded29d968b8ccf41d4dffa73c3f8f030a9f5d diff --git a/qttools b/qttools index 1a7bc520..a6936867 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1a7bc520c5df4da80b7e65acbec1f546f9c87870 +Subproject commit a693686709352dee9441f2f2633606e7327e321b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index bfa8da56..b6745858 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit bfa8da56b1edd77ec416c24b96d33db94368be80 +Subproject commit b67458583c3cd38b48d8d00a88c9e236ca64b368 diff --git a/qtwayland b/qtwayland index e9bf98d2..751f015b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e9bf98d2bf8c1d5d4f671bcb6146ed13de213f01 +Subproject commit 751f015b67d373e4e44ee12b14088970eca67a43 diff --git a/qtwebengine b/qtwebengine index 61e35009..3b24c024 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 61e35009aa276e9d2d7ff1787b52ba06f8cde37f +Subproject commit 3b24c024f2606cd93b1f397338f349582003c2ce diff --git a/qtwebsockets b/qtwebsockets index 91582c53..f309a4ac 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 91582c53c5c3b404169ce2a44d75ac8102043513 +Subproject commit f309a4ac80b4c1e5c8076388e196a1bd15e83f57 diff --git a/qtwebview b/qtwebview index f7f8f8f6..0685dffb 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f7f8f8f6c12b8617b4d9f89dd2aaaf241a1a6f8e +Subproject commit 0685dffb9275613e06f47e1d07643e55eeff56d9 diff --git a/qtxmlpatterns b/qtxmlpatterns index da19c988..b99924c9 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit da19c9882295a8f3216284935c05ad4b89c445bd +Subproject commit b99924c941a948793f071ab2bc829c41b660a395 -- cgit v1.2.1 From ed7ceee87d9b5a70960459bcfbb4aed0681813e6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 29 Apr 2017 11:48:31 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I3b16919a9c1e93e955fd9d5e3f3a8f699fa914a5 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 9b478e91..b5800ac0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9b478e9179522315ea53fe10ec1278a1f77753f8 +Subproject commit b5800ac037321e161d31ee362688aef179c8d9d2 diff --git a/qtactiveqt b/qtactiveqt index b0c50bc1..988a5837 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b0c50bc1e89085c1f8f9f311d4eaa6802a15168c +Subproject commit 988a5837e932f55e190d288cd395eebde28052e3 diff --git a/qtbase b/qtbase index 11e37a0e..425986ac 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 11e37a0e8c9e2c17d13b1ab44ca9b3f35b7a9844 +Subproject commit 425986acf32a60288a8a2ed9b3b2b180f60b5514 diff --git a/qtconnectivity b/qtconnectivity index 731c202e..ec0fb110 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 731c202e13e74d0b97d9a5fcfb028b1ce1bf735d +Subproject commit ec0fb110eccb237a230fec61e02740de9c74fe1f diff --git a/qtdatavis3d b/qtdatavis3d index d58ec762..0340120d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d58ec7629ba79058f8b7a27be3c6fb2947f5a017 +Subproject commit 0340120d5f7940c9aebfd0f60328805227f8824d diff --git a/qtdeclarative b/qtdeclarative index 0757777f..6a2febc6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0757777f196647e04c6813f0347179437fdc4812 +Subproject commit 6a2febc680e163e56eb61d322d156dbf6fb07e0e diff --git a/qtlocation b/qtlocation index f3a004e5..1aa24b25 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f3a004e55a4731dde881c7a8e47f0720275b9185 +Subproject commit 1aa24b25a99335e350503fb45a0bca2f25d3dd05 diff --git a/qtmultimedia b/qtmultimedia index 9dbdd5db..27013013 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9dbdd5db797fccb8932f49d7380fb5f5eda12cf2 +Subproject commit 270130134175bd62a1b2e34bf8c00bd24588f69b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 52ea821c..d1ff2fbb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 52ea821c43dfd6afc9ad21a9066c1eb39937c40d +Subproject commit d1ff2fbb1a444dd8d1d574ac649dbc257325a5b7 diff --git a/qtrepotools b/qtrepotools index 91471704..59e404b2 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3 +Subproject commit 59e404b2f2628ca3f4e8104ec55c7409f9db90f3 diff --git a/qtwebengine b/qtwebengine index 3b24c024..9df14dff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3b24c024f2606cd93b1f397338f349582003c2ce +Subproject commit 9df14dff86fcc2daa0d9342174dba62ec32169bc diff --git a/qtwebsockets b/qtwebsockets index f309a4ac..5147400e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f309a4ac80b4c1e5c8076388e196a1bd15e83f57 +Subproject commit 5147400ea72d349e23a5280fb8d3ca9425237ddf -- cgit v1.2.1 From e3e30b4a2b037d6bd4140b381b8051e1a52da646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 23 Mar 2017 09:47:30 +0200 Subject: Provision toolchains and take QNX 7 SDP into use with 64 bit Win10 Task-number: QTQAINFRA-1113 Change-Id: I7151dc89c6813ad6c37fde20b8aa641578c54d4c Reviewed-by: Simon Hausmann --- coin/platform_configs/qt5.txt | 2 + .../qtci-windows-10-x86_64/05-mingw53.ps1 | 48 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/05-qnx_700.ps1 | 46 +++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 25472f88..8c3e2bd2 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -11,5 +11,7 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packagin qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-3 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-3 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 new file mode 100644 index 00000000..d4439856 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 @@ -0,0 +1,48 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script installs MinGW 5.3 + + +$zip = "c:\users\qt\downloads\i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z" + +Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/mingw_32/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z -OutFile $zip +Verify-Checksum $zip "d4f21d25f3454f8efdada50e5ad799a0a9e07c6a" +Extract-7Zip $zip C:\ +Rename-Item -path C:\mingw32 -newName C:\MinGW530 + +[Environment]::SetEnvironmentVariable("MINGW530", "C:\MinGW530", "Machine") +echo "MinGW = 5.3.0" >> ~/versions.txt +del $zip 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 new file mode 100644 index 00000000..cc00fe0d --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -0,0 +1,46 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script installs QNX SDP 7.0 + +$zip = "c:\users\qt\downloads\qnx700.7z" + +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip +Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb" +Extract-7Zip $zip C:\ + +[Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine") +echo "QNX SDP = 7.0.0" >> ~/versions.txt +del $zip -- cgit v1.2.1 From 5af86c74b28cd15c0ea51b5e2047ebb553ae371b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 1 May 2017 09:34:06 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I6aed41bf25a3230d2c6643dea89033ad66543c91 Reviewed-by: Liang Qi --- qtbase | 2 +- qtquickcontrols2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 425986ac..a4192166 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 425986acf32a60288a8a2ed9b3b2b180f60b5514 +Subproject commit a4192166c87fdf0aa69c759f6b0d8cfff85b6904 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d1ff2fbb..cea8967b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d1ff2fbb1a444dd8d1d574ac649dbc257325a5b7 +Subproject commit cea8967b138239d60084510821a69be0cc1c2c01 -- cgit v1.2.1 From 385ecebe80996035b218d0de9ffffe7a3c059a43 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 19 Apr 2017 13:03:03 +0300 Subject: Platform Configurations for Visual Studio 2017 MSVC 2017 is pre-provisioned to tier 1 template with MSVC 2017 build tools. When winrt arm is available for msvc 2017 in qtbase it will be added to platform configurations also Change-Id: Ib33cd63a974683de080bf5734081a73ecb1dabeb Reviewed-by: Simon Hausmann --- coin/platform_configs/qt5.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 8c3e2bd2..c89ac36f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,6 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-6 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86-5 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 -- cgit v1.2.1 From 4ee0e8fb460273470187210170c0ccbbbdefe30e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 2 May 2017 12:15:39 +0200 Subject: Fix tier1 template selection for QNX 7 builds on Windows Use the latest windows 10 template, not something outdated. Amends e3e30b4a2b037d6bd4140b381b8051e1a52da646 with the tier1 update from commit 070d9333a6fc768526479edd2b81bba9e030f655. Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7 Reviewed-by: Heikki Halmet --- coin/platform_configs/qt5.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index c89ac36f..e73ec703 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -13,7 +13,7 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packagin qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-3 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-3 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-6 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-6 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.1 From 40b07da1941a66a748c293cbe91668debd63c59a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 24 Apr 2017 13:43:05 +0200 Subject: make sure that all submodule urls end in .git http(s) needs that. Started-by: Alvaro Denis Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988 Reviewed-by: Oswald Buddenhagen --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8be71f45..6355ce8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -295,32 +295,32 @@ depends = qtbase recommends = qtdeclarative path = qtgamepad - url = ../qtgamepad + url = ../qtgamepad.git branch = 5.9 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml - url = ../qtscxml + url = ../qtscxml.git branch = 5.9 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech - url = ../qtspeech + url = ../qtspeech.git branch = 5.9 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth - url = ../qtnetworkauth + url = ../qtnetworkauth.git branch = 5.9 status = preview [submodule "qtremoteobjects"] depends = qtbase path = qtremoteobjects - url = ../qtremoteobjects + url = ../qtremoteobjects.git branch = 5.9 status = preview -- cgit v1.2.1 From c1dd36f4d12527287d3e157611557011c4f1461d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 May 2017 11:19:14 +0300 Subject: Update submodules on '5.9' in qt5 qttools manually updated to include compile fix. Change-Id: I4cee5023ab7c33f96ff509500b1b9db53daeaee6 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index a4192166..8e83d615 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a4192166c87fdf0aa69c759f6b0d8cfff85b6904 +Subproject commit 8e83d6150121412b9f493ff525bce6f09d105463 diff --git a/qtdeclarative b/qtdeclarative index 6a2febc6..98fb1a65 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6a2febc680e163e56eb61d322d156dbf6fb07e0e +Subproject commit 98fb1a65adb8ddf5fa1516bed067a13eed36091c diff --git a/qtlocation b/qtlocation index 1aa24b25..a2ea3f87 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1aa24b25a99335e350503fb45a0bca2f25d3dd05 +Subproject commit a2ea3f872c45150e5485134e69d65b474f1f996b diff --git a/qtmultimedia b/qtmultimedia index 27013013..03368d61 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 270130134175bd62a1b2e34bf8c00bd24588f69b +Subproject commit 03368d61c2cc809a2a3ba209694b71bb12d1c894 diff --git a/qtquickcontrols b/qtquickcontrols index b70d45d3..55575022 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b70d45d3f3e8096fb88c5cee1cf1f0b6e7c15f34 +Subproject commit 555750221ee3850ba70169a2b6854041b434c592 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cea8967b..00d2861f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cea8967b138239d60084510821a69be0cc1c2c01 +Subproject commit 00d2861f7447d0673bffb1f964e71bb5792b8312 diff --git a/qtremoteobjects b/qtremoteobjects index f0487407..d0b7ce30 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f0487407a00f542f88aff0d00c0a0ce7d4b24f21 +Subproject commit d0b7ce30d3a99a751581147b647072cfbae9d321 diff --git a/qttools b/qttools index a6936867..e44e967d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a693686709352dee9441f2f2633606e7327e321b +Subproject commit e44e967d0c5f545473490e893db628509a5417fe diff --git a/qttranslations b/qttranslations index 1b2c07c5..abdf2751 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1b2c07c5fe056321586ce0b4e334398d77505a65 +Subproject commit abdf2751da8d635a074b9f8abcb7c5831cb7e4ed diff --git a/qtwebengine b/qtwebengine index 9df14dff..fa0aa60a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9df14dff86fcc2daa0d9342174dba62ec32169bc +Subproject commit fa0aa60a9a7da656dad351e89e0a4612e889c7db diff --git a/qtxmlpatterns b/qtxmlpatterns index b99924c9..84ee5b9b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b99924c941a948793f071ab2bc829c41b660a395 +Subproject commit 84ee5b9b2636a5d33852fc0fb114968c5fae1d1c -- cgit v1.2.1 From 933688fc39b21fae8f201fed29ab46cf8ce5ded9 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 27 Apr 2017 12:54:54 +0900 Subject: Change qt3d dependency on qtimageformats to optional only examples use webp from qtimageformats. Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7 Reviewed-by: Sean Harmer Reviewed-by: Oswald Buddenhagen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6355ce8b..a9d23be2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -146,8 +146,8 @@ branch = 5.9 status = addon [submodule "qt3d"] - depends = qtdeclarative qtimageformats - recommends = qtgamepad + depends = qtdeclarative + recommends = qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = 5.9 -- cgit v1.2.1 From 7937eb2d9e19bef89f49db2d510b033f6281af5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 3 May 2017 09:54:56 +0300 Subject: Provisioning: disable screensaver password Previously provisioning disabled screensaver on startup but didn't affect current session. Thus the screensaver hits the VMs while provisioning and without this commit the screen gets locked. This prevents the lock and we get to the desktop on the VMs. Change-Id: Icd783127e898ece6bebb5598ab86f12d5062eeb5 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh | 7 +++++++ coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh index 48430389..4577709f 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh @@ -46,6 +46,7 @@ ExceptionSetInitialDelay=101 ExceptionSetDelay=102 ExceptionVNC=103 ExceptionNTS=104 +ExceptionDisableScreensaverPassword=105 try ( @@ -78,6 +79,8 @@ try EOT ) || throw $ExceptionDisableScreensaver + defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword + echo "Set keyboard type rates and delays" # normal minimum is 15 (225 ms) defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay @@ -113,5 +116,9 @@ catch || { echo "Failed to set NTS." exit 1; ;; + $ExceptionDisableScreensaverPassword) + echo "Failed to disable requiring of password after screensaver is enabled." + exit 1; + ;; esac } diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh index 47bf03f8..920a2540 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh @@ -46,6 +46,7 @@ ExceptionSetInitialDelay=101 ExceptionSetDelay=102 ExceptionVNC=103 ExceptionNTS=104 +ExceptionDisableScreensaverPassword=105 try ( @@ -78,6 +79,8 @@ try EOT ) || throw $ExceptionDisableScreensaver + defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword + echo "Set keyboard type rates and delays" # normal minimum is 15 (225 ms) defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay @@ -113,6 +116,10 @@ catch || { echo "Failed to set NTS." exit 1; ;; + $ExceptionDisableScreensaverPassword) + echo "Failed to disable requiring of password after screensaver is enabled." + exit 1; + ;; esac } -- cgit v1.2.1 From 4f4de8aa1614cc6fc8d924c13509de869b4471fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 1 Mar 2017 21:58:42 +0100 Subject: Change OS X 10.11 to run tests instead of 10.10 This commit removes OS X 10.10 as a developer build target, and enables autotests on osx 10.11 developer build. Task-number: QTQAINFRA-1090 Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 7dc33b49..48eec8dc 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -15,9 +15,8 @@ qtci-linux-openSUSE-42.1-x86_64 GCC qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release DisableTests -qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch DisableTests +qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release -qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.1