mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-24 17:06:14 +08:00
Compare commits
110 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf3d2588cc | ||
|
|
9817f4a84c | ||
|
|
0150c62f60 | ||
|
|
1a6968113c | ||
|
|
c09f683eda | ||
|
|
294ec185e4 | ||
|
|
f5fe555ec7 | ||
|
|
f8bed24b63 | ||
|
|
f2fc36b021 | ||
|
|
0750f2b6ce | ||
|
|
4857e0313f | ||
|
|
5b0a9d688b | ||
|
|
cf257c2869 | ||
|
|
433f6dddb5 | ||
|
|
e5627e6de3 | ||
|
|
eb78767825 | ||
|
|
bc65857c58 | ||
|
|
680c596ca0 | ||
|
|
77eeee64a4 | ||
|
|
6fabd34960 | ||
|
|
657cab9312 | ||
|
|
b0b0c9c471 | ||
|
|
ec6d9b53b4 | ||
|
|
dcc26dafad | ||
|
|
7c6a3f423a | ||
|
|
891afe7066 | ||
|
|
1282fa3662 | ||
|
|
23d1112839 | ||
|
|
e1bfa77391 | ||
|
|
fd6fe04cad | ||
|
|
0958cc4cca | ||
|
|
78a764ee65 | ||
|
|
b6414f7d08 | ||
|
|
99ff42545f | ||
|
|
90f5a25c66 | ||
|
|
4477c49291 | ||
|
|
33feec0dc8 | ||
|
|
64f62b4b95 | ||
|
|
42ed864856 | ||
|
|
6cfd3a2118 | ||
|
|
af364a39aa | ||
|
|
40e137cbee | ||
|
|
5c5e807018 | ||
|
|
fc1d30a447 | ||
|
|
acafa69d57 | ||
|
|
95ff2f4870 | ||
|
|
b385314451 | ||
|
|
67754033cf | ||
|
|
6fe0028baa | ||
|
|
447361eb68 | ||
|
|
d5e52dbe26 | ||
|
|
ddae625e19 | ||
|
|
a4280c4f44 | ||
|
|
24961e9f2c | ||
|
|
1240baedcc | ||
|
|
8ccf739ae0 | ||
|
|
828c7e9e4e | ||
|
|
f7ef3ff7f0 | ||
|
|
3727ce11ac | ||
|
|
e06238e996 | ||
|
|
e205785b5c | ||
|
|
8ddc3c1254 | ||
|
|
bbe0a01fde | ||
|
|
4f64747383 | ||
|
|
e568a942ec | ||
|
|
6a4d5e4bc8 | ||
|
|
801066c40d | ||
|
|
e96f60a228 | ||
|
|
4e02d96116 | ||
|
|
0c66994ae9 | ||
|
|
ad474f110f | ||
|
|
30f22b8351 | ||
|
|
4ace6667f2 | ||
|
|
23824d231b | ||
|
|
777967f97b | ||
|
|
868e545eb2 | ||
|
|
cef159accd | ||
|
|
3afd172a25 | ||
|
|
b7c2e9a846 | ||
|
|
3df0a5837c | ||
|
|
a9752d68ed | ||
|
|
e23b244494 | ||
|
|
273e5b82cf | ||
|
|
7251401281 | ||
|
|
5758a88e59 | ||
|
|
a550ad21bf | ||
|
|
d9beab9abd | ||
|
|
20dcf55e7d | ||
|
|
53b920dc69 | ||
|
|
534d63e652 | ||
|
|
e785abbec1 | ||
|
|
211080722e | ||
|
|
30236c3f15 | ||
|
|
18e84e7c06 | ||
|
|
d4bb786963 | ||
|
|
3fa8726fa7 | ||
|
|
81523d838c | ||
|
|
7a8c874231 | ||
|
|
e52c7efa4c | ||
|
|
c6d04d68bd | ||
|
|
2c53e3d08c | ||
|
|
b93073ecc9 | ||
|
|
d758a3b055 | ||
|
|
d2b26ede9c | ||
|
|
2051c2987e | ||
|
|
c485f3e4a7 | ||
|
|
7b30d85bdc | ||
|
|
e4ff528bb6 | ||
|
|
a2a6cf11a7 | ||
|
|
2068af50ca |
120
.gitmodules
vendored
120
.gitmodules
vendored
@@ -1,66 +1,66 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt qtwebkit
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
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.1
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -136,135 +136,177 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtdeclarative qtimageformats
|
||||
recommends = qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.6
|
||||
status = preview
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
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.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = preview
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
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.1
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtquickcontrols qtwebchannel
|
||||
recommends = qtlocation
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.6
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtquickcontrols
|
||||
depends = qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.6
|
||||
status = preview
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase qtandroidextras
|
||||
recommends = qtdeclarative
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad
|
||||
branch = 5.7.1
|
||||
status = preview
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml
|
||||
branch = 5.7.1
|
||||
status = preview
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech
|
||||
branch = dev
|
||||
status = ignore
|
||||
|
||||
8
README
8
README
@@ -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/]
|
||||
|
||||
10
coin/provisioning/common/cmake.ps1
Normal file
10
coin/provisioning/common/cmake.ps1
Normal file
@@ -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
|
||||
44
coin/provisioning/common/conan.ps1
Normal file
44
coin/provisioning/common/conan.ps1
Normal file
@@ -0,0 +1,44 @@
|
||||
. "$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 | Out-Null
|
||||
|
||||
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
|
||||
|
||||
function Start-Process-Logged
|
||||
{
|
||||
Write-Host "Start-Process", $args
|
||||
Start-Process @args
|
||||
}
|
||||
|
||||
function Run-Conan-Install
|
||||
{
|
||||
Param (
|
||||
[string]$ConanfilesDir,
|
||||
[string]$BuildinfoDir,
|
||||
[string]$Arch,
|
||||
[string]$Compiler,
|
||||
[string]$CompilerVersion,
|
||||
[string]$CompilerRuntime
|
||||
)
|
||||
|
||||
if ($CompilerRuntime) {
|
||||
$runtimeArg = "-s compiler.runtime=$($CompilerRuntime)"
|
||||
}
|
||||
|
||||
Get-ChildItem -Path "$ConanfilesDir\*.txt" |
|
||||
ForEach-Object {
|
||||
$outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
|
||||
New-Item $outpwd -Type directory -Force
|
||||
Start-Process-Logged `
|
||||
"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) $($runtimeArg)" `
|
||||
-NoNewWindow -Wait -Verbose
|
||||
}
|
||||
}
|
||||
51
coin/provisioning/common/patch_qnx.ps1
Normal file
51
coin/provisioning/common/patch_qnx.ps1
Normal file
@@ -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
|
||||
7
coin/provisioning/common/ruby.ps1
Normal file
7
coin/provisioning/common/ruby.ps1
Normal file
@@ -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
|
||||
@@ -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
|
||||
|
||||
|
||||
64
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
Normal file
64
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
Normal file
@@ -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/"
|
||||
@@ -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
|
||||
1
coin/provisioning/qtci-windows-10-x86/cmake.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86/cmake.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\cmake.ps1"
|
||||
9
coin/provisioning/qtci-windows-10-x86/conan.ps1
Normal file
9
coin/provisioning/qtci-windows-10-x86/conan.ps1
Normal file
@@ -0,0 +1,9 @@
|
||||
. "$PSScriptRoot\..\common\conan.ps1"
|
||||
|
||||
Run-Conan-Install `
|
||||
-ConanfilesDir "$PSScriptRoot\conanfiles" `
|
||||
-BuildinfoDir MSVC2015-x86 `
|
||||
-Arch x86 `
|
||||
-Compiler "Visual Studio" `
|
||||
-CompilerVersion 14 `
|
||||
-CompilerRuntime MD
|
||||
@@ -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
|
||||
1
coin/provisioning/qtci-windows-10-x86/ruby.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86/ruby.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\ruby.ps1"
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\cmake.ps1"
|
||||
9
coin/provisioning/qtci-windows-10-x86_64/conan.ps1
Normal file
9
coin/provisioning/qtci-windows-10-x86_64/conan.ps1
Normal file
@@ -0,0 +1,9 @@
|
||||
. "$PSScriptRoot\..\common\conan.ps1"
|
||||
|
||||
Run-Conan-Install `
|
||||
-ConanfilesDir "$PSScriptRoot\conanfiles" `
|
||||
-BuildinfoDir MSVC2015-x86_64 `
|
||||
-Arch x86_64 `
|
||||
-Compiler "Visual Studio" `
|
||||
-CompilerVersion 14 `
|
||||
-CompilerRuntime MD
|
||||
@@ -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
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\ruby.ps1"
|
||||
1
coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1
Normal file
1
coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\patch_qnx.ps1"
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: d3889211dc...0eac16fbda
Submodule qtactiveqt updated: e5878886ed...67dcd1a1b5
Submodule qtandroidextras updated: d973d761c5...2622247a0c
2
qtbase
2
qtbase
Submodule qtbase updated: 6ea626a32f...a55f36211e
Submodule qtcanvas3d updated: 6b6bda4c7f...8e34d6f539
1
qtcharts
Submodule
1
qtcharts
Submodule
Submodule qtcharts added at da07182524
Submodule qtconnectivity updated: 9dba73f305...d884d20c55
1
qtdatavis3d
Submodule
1
qtdatavis3d
Submodule
Submodule qtdatavis3d added at 2523056490
Submodule qtdeclarative updated: 79121a0827...2a992040e2
2
qtdoc
2
qtdoc
Submodule qtdoc updated: f822f0944a...79ed30f70c
Submodule qtenginio updated: 6c37300c66...15090ec536
1
qtgamepad
Submodule
1
qtgamepad
Submodule
Submodule qtgamepad added at e5066759bf
Submodule qtgraphicaleffects updated: 0b68e91d68...f536e36e31
Submodule qtimageformats updated: d7bdc138b8...11300c62aa
Submodule qtlocation updated: 8cb45ab8aa...de5be121d8
Submodule qtmacextras updated: 15c849dcfd...237ad2f2f0
Submodule qtmultimedia updated: 9d9a29bcc3...e4aef963cb
Submodule qtpurchasing updated: b5c6c76fac...52910f6a43
2
qtqa
2
qtqa
Submodule qtqa updated: e49c7d6f19...cd6bd18319
2
qtquick1
2
qtquick1
Submodule qtquick1 updated: 5eab543c5c...26229cfa0b
Submodule qtquickcontrols updated: c2356328f8...84b3cf1c04
Submodule qtquickcontrols2 updated: e93c73c0aa...6f6e073815
Submodule qtrepotools updated: 7b54379392...973462d65b
2
qtscript
2
qtscript
Submodule qtscript updated: b4eb16b7ff...42f94f3048
1
qtscxml
Submodule
1
qtscxml
Submodule
Submodule qtscxml added at 63ec7e2ff9
Submodule qtsensors updated: 724008411c...5a57beaaa5
Submodule qtserialbus updated: 0d31e8cd10...768b2d4636
Submodule qtserialport updated: dd17942259...0b9f41c28c
1
qtspeech
Submodule
1
qtspeech
Submodule
Submodule qtspeech added at ca8768b90c
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 78bc427395...d3d3db5a75
2
qttools
2
qttools
Submodule qttools updated: 316720b417...8575ed82ff
Submodule qttranslations updated: 225e1740fe...c4795ce81f
1
qtvirtualkeyboard
Submodule
1
qtvirtualkeyboard
Submodule
Submodule qtvirtualkeyboard added at 5ac6b611b1
Submodule qtwayland updated: 90123a9f30...4b23163fb6
Submodule qtwebchannel updated: 3b28a6956c...31eb0d8c7d
Submodule qtwebengine updated: 36feb681a9...9cc97f0c63
2
qtwebkit
2
qtwebkit
Submodule qtwebkit updated: 490b7b65ed...b9ce7cfc7f
Submodule qtwebkit-examples updated: 2a143bf81b...1ac4ee2402
Submodule qtwebsockets updated: ef7b03e3e5...60cede232a
Submodule qtwebview updated: 16887a0294...61c2a76cf0
Submodule qtwinextras updated: 9ca1e67897...2242619275
Submodule qtx11extras updated: df10edcfae...d311bf931b
Submodule qtxmlpatterns updated: 66be7fd267...89dbcc4f80
Reference in New Issue
Block a user