diff options
61 files changed, 361 insertions, 46 deletions
diff --git a/.gitmodules b/.gitmodules index 9bcdf4ce..b24ddfc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.7 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.7 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.7 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.7 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.7 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,135 +136,177 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats + recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.6 - status = preview + branch = 5.7 + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 - status = obsolete + branch = 5.7 + status = ignore [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.7 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 - status = deprecated + branch = 5.7 + status = ignore [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.7 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquickcontrols2"] - depends = qtquickcontrols + depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 - status = preview + branch = 5.7 + status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git + branch = 5.7 + status = addon +[submodule "qtcharts"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtcharts + url = ../qtcharts.git + branch = 5.7 + status = addon +[submodule "qtdatavis3d"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtdatavis3d + url = ../qtdatavis3d.git + branch = 5.7 + status = addon +[submodule "qtvirtualkeyboard"] + depends = qtbase qtdeclarative qtsvg + recommends = qtmultimedia qtquickcontrols + path = qtvirtualkeyboard + url = ../qtvirtualkeyboard.git + branch = 5.7 + status = addon +[submodule "qtgamepad"] + depends = qtbase + recommends = qtdeclarative + path = qtgamepad + url = ../qtgamepad + branch = 5.7 + status = preview +[submodule "qtscxml"] + depends = qtbase qtdeclarative + path = qtscxml + url = ../qtscxml + branch = 5.7 + status = preview +[submodule "qtspeech"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtspeech + url = ../qtspeech branch = dev status = ignore @@ -10,7 +10,7 @@ HOW TO BUILD QT5 - Perl 5.8 or later - Python 2.7 or later - - C++ compiler supporting the C++98 standard + - C++ compiler supporting the C++11 standard For other platform specific requirements, please see section "Setting up your machine" on: @@ -39,8 +39,10 @@ HOW TO BUILD QT5 Windows: -------- - Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the - following tools can be found in the path: + Open a command prompt. + Ensure that the following tools can be found in the path: + * Supported compiler (Visual Studio 2012 or later, + MinGW-builds gcc 4.9 or later) * Perl version 5.12 or later [http://www.activestate.com/activeperl/] * Python version 2.7 or later [http://www.activestate.com/activepython/] * Ruby version 1.9.3 or later [http://rubyinstaller.org/] diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 new file mode 100644 index 00000000..6870f3a7 --- /dev/null +++ b/coin/provisioning/common/cmake.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" + +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip +Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" + +Extract-Zip $zip C: +Remove-Item C:\CMake -Force -Recurse +Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 new file mode 100644 index 00000000..6d7cf07b --- /dev/null +++ b/coin/provisioning/common/conan.ps1 @@ -0,0 +1,33 @@ +. "$PSScriptRoot\helpers.ps1" + +$installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" + +Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer +Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" +& $installer /DIR=C:\Utils\Conan /VERYSILENT + +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") + +function Run-Conan-Install +{ + Param ( + [string]$ConanfilesDir, + [string]$BuildinfoDir, + [string]$Arch, + [string]$Compiler, + [string]$CompilerVersion + ) + + Get-ChildItem -Path "$ConanfilesDir\*.txt" | + ForEach-Object { + $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" + New-Item $outpwd -Type directory -Force + Start-Process ` + "C:\Utils\Conan\conan\conan.exe" ` + -WorkingDirectory $outpwd ` + -ArgumentList "install -i -f $($_.FullName)", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` + -NoNewWindow -Wait + } +} diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 new file mode 100644 index 00000000..2fca7b67 --- /dev/null +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -0,0 +1,51 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Patch QNX SDK due to issues in the standard library. +# The patches are available here: +# http://www.qnx.com/download/feature.html?programid=27555 +# A copy of the patch must be in the root of the Coin path in +# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip + + +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" +$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" +$tempDir = "C:\temp\qnx_path" + +Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip +Verify-Checksum $zip $sha1 +Extract-Zip $zip $tempDir +Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force +Remove-Item $tempDir -recurse diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 new file mode 100644 index 00000000..343bacfc --- /dev/null +++ b/coin/provisioning/common/ruby.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" + +Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer +Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" +& $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh index 81132d9b..7f1cf05b 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh @@ -99,7 +99,3 @@ InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile 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-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh new file mode 100644 index 00000000..19993ecc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -0,0 +1,64 @@ +#!/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# Patch QNX SDK due to issues in the standard library. +# The patches are available here: +# http://www.qnx.com/download/feature.html?programid=27555 +# A copy of the patch must be in the root of the Coin path in +# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip + +set -e +sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" + +function InstallZipPackageFromURL { + url=$1 + expectedSha1=$2 + targetDirectory=$3 + + targetFile=`mktemp` || echo "Failed to create temporary file" + wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + + tempDir=`mktemp -d` || echo "Failed to create temporary directory" + /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive" + trap "sudo rm -fr $targetFile $tempDir" EXIT + + sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ +} + +echo "Patching QNX" + +baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh new file mode 100644 index 00000000..b14e94a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh @@ -0,0 +1,49 @@ +#!/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +sudo apt-get update +sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev + +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR +git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua +cd freeopcua +git checkout 57b6993d39b6761af773fa4fa37c3fbd39c764f1 +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. +make +sudo make install diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 new file mode 100644 index 00000000..718d25de --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -0,0 +1,8 @@ +. "$PSScriptRoot\..\common\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt new file mode 100644 index 00000000..d1fcbfba --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -0,0 +1,20 @@ +[requires] +cmake_installer/0.1@lasote/testing +icu/57.1@Vitallium/stable +libxml2-qt/2.9.4@Vitallium/stable +libxslt-qt/1.1.29@Vitallium/stable + +[generators] +cmake +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 new file mode 100644 index 00000000..04887712 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -0,0 +1,8 @@ +. "$PSScriptRoot\..\common\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2015-x86_64 ` + -Arch x86_64 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt new file mode 100644 index 00000000..d1fcbfba --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -0,0 +1,20 @@ +[requires] +cmake_installer/0.1@lasote/testing +icu/57.1@Vitallium/stable +libxml2-qt/2.9.4@Vitallium/stable +libxslt-qt/1.1.29@Vitallium/stable + +[generators] +cmake +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/qt3d b/qt3d -Subproject d3889211dc245d44dab25dcc9fbbc4b57e92ac3 +Subproject cf00f2a1d967e8413d138ffe010e6928b469cb3 diff --git a/qtactiveqt b/qtactiveqt -Subproject e5878886ed8261fb5d3e1fb93595be03e8f12b8 +Subproject fab7808e45c6742d7529b7df55f0d5e3fe9c7b5 diff --git a/qtandroidextras b/qtandroidextras -Subproject d973d761c5722ee21106f84ca5db89bb58c103d +Subproject 2622247a0c68a785a794033957e88224063e9c4 diff --git a/qtbase b/qtbase -Subproject 6ea626a32fe070847629b6715c2a253717ff741 +Subproject 4518345b80b0ee1101ecb0e7349728abd237aa6 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 6b6bda4c7fc419112386ca9b4fe89d092bf14cc +Subproject 8e34d6f5399a29d45f9402219f13b631e29fd4b diff --git a/qtcharts b/qtcharts new file mode 160000 +Subproject a64d954717a4b7fecc8eeea001e4a7748398513 diff --git a/qtconnectivity b/qtconnectivity -Subproject 9dba73f30505ed7c220055788fba3cd201848fd +Subproject c4b8dee6b4cfdc6728094d237d7984791e2cece diff --git a/qtdatavis3d b/qtdatavis3d new file mode 160000 +Subproject 2523056490c3f7a35d176deb583ba46899fe260 diff --git a/qtdeclarative b/qtdeclarative -Subproject 79121a0827df365468a02db20179d2c2d5ae720 +Subproject e4134cfd8086a78c61a46fdfb908ade27c8d984 diff --git a/qtdoc b/qtdoc -Subproject f822f0944a5bc6710df173f3fec67ae1e364ab8 +Subproject 822ed893ecb973f0f42cb431b42a811a2bdcaa2 diff --git a/qtenginio b/qtenginio -Subproject 6c37300c667e3049178f049a5b86e7ea955c967 +Subproject 15090ec53621211616c4136ab37e0332c3ae709 diff --git a/qtgamepad b/qtgamepad new file mode 160000 +Subproject e5066759bf5d5848bec88683a371f31346a315b diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b +Subproject f536e36e3188903404fac78064ea7872dd8cc0d diff --git a/qtimageformats b/qtimageformats -Subproject d7bdc138b89bf0c52ba9ddf22b34d2ccd06b393 +Subproject 11300c62aa021ef07f3e4de8bd875bfcbcbe2f7 diff --git a/qtlocation b/qtlocation -Subproject 8cb45ab8aabaf0246c49e3314e4a84456ff7b06 +Subproject 3f813d1c8c24e5da67d3f096eb3f5c73e760e64 diff --git a/qtmacextras b/qtmacextras -Subproject 15c849dcfded8818765e439f521a665ae12e707 +Subproject 237ad2f2f0850a35aec92776b968db3965d352c diff --git a/qtmultimedia b/qtmultimedia -Subproject 9d9a29bcc31101e394ea484f61985cac75524ba +Subproject 62eeaba645d0f7c42246a0b026c532919a5b045 diff --git a/qtpurchasing b/qtpurchasing -Subproject b5c6c76fac771326064295368a53cbdaf2bf0f7 +Subproject e843384150e7b3cad3e837d611c50f6db4d8594 diff --git a/qtqa b/qtqa -Subproject e49c7d6f19d1ac76137534ec696ce1a9f4a7dbd +Subproject 66911ea5ba5fe6c5e44d40760008dd65efe2e70 diff --git a/qtquick1 b/qtquick1 -Subproject 5eab543c5c955f5057225b9bdb6b2757516dbd3 +Subproject 26229cfa0b729313893af5674d604e8692dbb94 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject c2356328f88b044c8956fe7860c4c04fca4f2c3 +Subproject d9aae9ff99d20b58487b0a48801864d13115363 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject e93c73c0aa15cd973e008a04a70a7c69719ad24 +Subproject e95dc3b4853c1736aef0ef2cc5248ec0aa46e3f diff --git a/qtrepotools b/qtrepotools -Subproject 7b5437939280b0788b4caa4a83f9193cfe8f97e +Subproject ef0773a19a9697e2c3a6a2046bd1be670f7e58e diff --git a/qtscript b/qtscript -Subproject b4eb16b7ffd7d281610765eab4332036d7d8f81 +Subproject 42f94f30488a01751f387dc9bd3160ce1b4dfa5 diff --git a/qtscxml b/qtscxml new file mode 160000 +Subproject 63ec7e2ff9f5f63ff32c1fb874fd7de8b5bfdb0 diff --git a/qtsensors b/qtsensors -Subproject 724008411c16aaf8fa25c09745e20d0d47d6572 +Subproject ecd018fe2ee4508e094f631d882ecc1360abec0 diff --git a/qtserialbus b/qtserialbus -Subproject 0d31e8cd10d09fd2b28052c89a4f96c32c10484 +Subproject f0482d704e3834f2199889f997b421c0171bd94 diff --git a/qtserialport b/qtserialport -Subproject dd17942259cf0cbe834f504128d522c93020ea8 +Subproject dee818e77a6cf9a6c164fbc7ee132fe875f7f99 diff --git a/qtspeech b/qtspeech new file mode 160000 +Subproject ca8768b90c07bff5804b1fbb704041a4472f65e diff --git a/qtsvg b/qtsvg -Subproject 78bc427395116bfaf3d99134f42aec5310020f8 +Subproject d3d3db5a75fe2ba992742e418bfefa25eddf768 diff --git a/qttools b/qttools -Subproject 316720b417a8360d2dfa24e9f3924fc46ef590e +Subproject ae9472a39327ce5d5d6735308bd2aef27277139 diff --git a/qttranslations b/qttranslations -Subproject 225e1740fec4559bf8d66d915ddd06b9d4f4811 +Subproject c4795ce81f9165a05e6f918066c671808447c53 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard new file mode 160000 +Subproject 5ac6b611b196c66bc8b01c23aa50d175ae7a730 diff --git a/qtwayland b/qtwayland -Subproject 90123a9f30ee1173c9d64e415fc9b6e27a4227f +Subproject fcaa38c84dc92ec951c43e1759d7a46080755cb diff --git a/qtwebchannel b/qtwebchannel -Subproject 3b28a6956cb3cab087481312dc82a907b118e0d +Subproject 2d29a774dd165ee2acd0b607b7e0d02a37c5fea diff --git a/qtwebengine b/qtwebengine -Subproject 36feb681a97b3dd690a54d2eafd58081036992f +Subproject 91679cda526857bd915c646d171f018ba86469f diff --git a/qtwebkit b/qtwebkit -Subproject 490b7b65edbd06da0818c0ac765ca6ebd219dce +Subproject 9b4236a660dcf0b9883fbc6dd388dccbe71ee0b diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 2a143bf81b2ffb3bd7a5f47cf719e6ed347bf38 +Subproject 1ac4ee240214a0e36b504fa1bcbc0c716d50620 diff --git a/qtwebsockets b/qtwebsockets -Subproject ef7b03e3e5e20f89963bae799f7ecb753f332c3 +Subproject 0ba923d6130cf35ecbfebfe38efd8e98017c573 diff --git a/qtwebview b/qtwebview -Subproject 16887a0294346edcdf0a912a69e2da892e4fd0e +Subproject 3223c849260d231cb1dd06c69ef65f28f3347e3 diff --git a/qtwinextras b/qtwinextras -Subproject 9ca1e678976d06d23b236011a3a55a025a27232 +Subproject 0b70552561919630f7a16b20bf1b1eec0e2ac8c diff --git a/qtx11extras b/qtx11extras -Subproject df10edcfae328f397c99192b322268c9e96f6da +Subproject 30b0e73404e7638fdf802990e81b98143f45c34 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 66be7fd267fa432f79a9f2bb6edc6a76285a7f3 +Subproject 89dbcc4f807015736a8ce3393b857735019d098 |