Compare commits

..

18 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
5b7def1433 Update submodules on '5.8' in qt5
Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-01 03:23:21 +00:00
Qt Submodule Update Bot
70361aac02 Update submodules on '5.8' in qt5
Change-Id: I165c8b4ae2709d009462b7fa5b91561759524e5f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-08-29 04:29:14 +00:00
Qt Submodule Update Bot
85771ddaaa Update submodules on '5.8' in qt5
Change-Id: I558721d2b7a630453ce794e7b7b97e1fca5ef3dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-08-28 17:43:30 +00:00
Simon Hausmann
31d8277404 Remove qtsystems from the list of recommended modules in qtlocation
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.

Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2016-08-28 17:43:26 +00:00
Qt Submodule Update Bot
7831d61e82 Update submodules on '5.8' in qt5
Change-Id: I188c217abff06c901f6da7561bc7ed1f3c12d8b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-08-24 18:02:48 +00:00
Jani Heikkinen
56fc6bc77b Removed TP status from qtscxml and qtserialbus
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-24 18:02:44 +00:00
Oswald Buddenhagen
71524c78f6 Merge remote-tracking branch 'origin/dev' into 5.8
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.

Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
2016-08-24 19:54:10 +02:00
Jesus Fernandez
b78f3579af Add qtnetworkauth
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-08-22 09:03:20 +00:00
Frederik Gladhorn
80ee813a03 Make QtSpeech a tech preview release for Qt 5.8
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2016-08-17 08:37:40 +00:00
Qt Submodule Update Bot
9410b99b16 Update submodules on 'dev' in qt5
Change-Id: Ie425f3f5a64e83702a6987d2892fbfa68bea5844
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-17 07:26:42 +00:00
Oswald Buddenhagen
7efeb26af7 Adjust submodule branches
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
2016-08-08 11:06:22 +02:00
Liang Qi
23f5d41bec Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I91cf0b6132a73c34c63d83a0bee1c028f2f819f8
2016-08-06 06:20:21 +02:00
Qt Submodule Update Bot
525a85bd6d Update submodules on 'dev' in qt5
Change-Id: I5c05b788003c8c274914ad5533d1eb7971c6e823
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-05 18:20:17 +00:00
Qt Submodule Update Bot
acf5c9d0ff Updated submodules
Change-Id: Ie27b2f6daddc68e72b09d779beaf1f61a8a29aa6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-07-02 20:55:05 +00:00
Qt Submodule Update Bot
ca7708f22e Updated submodules
Change-Id: I64b5898838652d6a785a45136947f7d55fa3d3f1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-06-30 07:46:13 +00:00
Frederik Gladhorn
f4c6a9c97c Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev 2016-06-28 15:58:17 +00:00
Qt Submodule Update Bot
f78835e062 Updated submodules.
Change-Id: I12a0a7f2f8174541a1d3c572478c3d0fb765a35d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-06-28 15:58:12 +00:00
Liang Qi
39a03d3d6a Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
2016-06-24 07:10:02 +02:00
74 changed files with 101 additions and 481 deletions

99
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.7.1
branch = 5.8
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.7.1
branch = 5.8
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.7.1
branch = 5.8
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.7.1
branch = 5.8
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
branch = 5.7.1
branch = 5.8
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.7.1
branch = 5.8
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
branch = 5.7.1
branch = 5.8
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -74,7 +74,7 @@
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
path = qtwebkit
url = ../qtwebkit.git
branch = 5.7
branch = 5.8
status = obsolete
project = WebKit.pro
priority = 20
@@ -82,7 +82,7 @@
depends = qtwebkit qttools
path = qtwebkit-examples
url = ../qtwebkit-examples.git
branch = 5.7
branch = 5.8
status = obsolete
[submodule "qtqa"]
depends = qtbase
@@ -93,17 +93,17 @@
priority = 50
[submodule "qtlocation"]
depends = qtbase
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
recommends = qtdeclarative qtquickcontrols qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -136,177 +136,184 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = 5.7
branch = dev
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.7.1
branch = 5.8
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.7.1
status = preview
branch = 5.8
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
path = qtenginio
url = ../qtenginio.git
branch = 5.7
branch = dev
status = ignore
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
branch = 5.7.1
branch = 5.8
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
depends = qtbase
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.7.1
branch = 5.8
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
branch = 5.7.1
branch = 5.8
status = preview
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
branch = 5.7.1
status = preview
branch = 5.8
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech
branch = dev
status = ignore
branch = 5.8
status = preview
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth
branch = 5.8
status = preview

View File

@@ -1,61 +0,0 @@
#############################################################################
##
## 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$
##
#############################################################################
Function Remove {
Param (
[string]$1
)
If (Test-Path $1){
echo "Remove $1"
Remove-Item -Recurse -Force $1
}Else{
echo "'$1' does not exists or already removed !!"
}
}
Function Remove-Path {
Param (
[string]$Path
)
echo "Remove $path from Path"
$name = "Path"
$value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";"
$type = "Machine"
[System.Environment]::SetEnvironmentVariable($name,$value,$type)
}
# Remove Python
Remove C:\Python27
Remove-Path C:\python27\scripts
Remove-Path C:\python27

View File

@@ -1,10 +0,0 @@
. "$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

View File

@@ -1,44 +0,0 @@
. "$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
}
}

View File

@@ -29,32 +29,3 @@ function Extract-Zip
$destinationFolder = $shell.Namespace($Destination)
$destinationFolder.CopyHere($zipfile.Items(), 16)
}
function BadParam
{
Param ([string]$Description)
throw("You must specify $Description")
}
function Download
{
Param (
[string] $OfficialUrl = $(BadParam("the official download URL")),
[string] $CachedUrl = $(BadParam("the locally cached URL")),
[string] $Destination = $(BadParam("a download target location"))
)
try {
Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
} catch {
Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
}
}
function Add-Path
{
Param (
[string]$Path
)
echo "Adding $Path to Path"
[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine)
}

View File

@@ -1,64 +0,0 @@
#############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script installs Python $version.
# Python is required for building Qt 5 from source.
$version = "2.7.10"
$package = "C:\Windows\temp\python-$version.msi"
# check bit version
if ([System.Environment]::Is64BitProcess -eq $TRUE) {
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi"
$sha1 = "f3a474f6ab191f9b43034c0fb5c98301553775d4"
}
else {
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi"
$sha1 = "9e62f37407e6964ee0374b32869b7b4ab050d12a"
}
echo "Fetching from URL..."
Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
echo "Installing $package..."
cmd /c "$package /q"
# We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
echo "Chancing allowZip64 value to 'True'..."
(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py
echo "Remove $package..."
del $package
Add-Path $path

View File

@@ -1,7 +0,0 @@
. "$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

View File

@@ -1,101 +0,0 @@
#!/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$
##
#############################################################################
# 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 version 23.0.3
# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6.
# 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-linux.tgz"
sdkBuildToolsVersion="23.0.3"
sdkApiLevel="android-18"
sdkUrl="$baseUrl/$sdkVersion"
sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
sdkTargetFile="$targetFolder/$sdkVersion"
sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile"
sdkFolderName="android-sdk-linux"
sdkName="sdk"
# NDK
ndkVersion="android-ndk-r10e-linux-x86_64.zip"
ndkUrl="$baseUrl/$ndkVersion"
ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
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 wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
sudo chmod 755 $targetFile
sudo $extract || echo "Failed to extract $url"
sudo chown -R qt:users $targetFolder/$folderName
sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name"
sudo rm -fr $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"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\cmake.ps1"

View File

@@ -1,9 +0,0 @@
. "$PSScriptRoot\..\common\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
-BuildinfoDir MSVC2015-x86 `
-Arch x86 `
-Compiler "Visual Studio" `
-CompilerVersion 14 `
-CompilerRuntime MD

View File

@@ -1,20 +0,0 @@
[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

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\python.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\ruby.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\cmake.ps1"

View File

@@ -1,9 +0,0 @@
. "$PSScriptRoot\..\common\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
-BuildinfoDir MSVC2015-x86_64 `
-Arch x86_64 `
-Compiler "Visual Studio" `
-CompilerVersion 14 `
-CompilerRuntime MD

View File

@@ -1,20 +0,0 @@
[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

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\python.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\ruby.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\python.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\python.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\python.ps1"

2
qt3d

Submodule qt3d updated: 0eac16fbda...5688464a38

2
qtbase

Submodule qtbase updated: a55f36211e...982f17e961

2
qtdoc

Submodule qtdoc updated: 79ed30f70c...cb23e64e86

1
qtnetworkauth Submodule

Submodule qtnetworkauth added at 0cb5de9c28

2
qtpim

Submodule qtpim updated: de4cfc6b53...02efef5ee6

2
qtqa

Submodule qtqa updated: cd6bd18319...1c973844b7

Submodule qtscxml updated: 63ec7e2ff9...90b000155e

2
qtsvg

Submodule qtsvg updated: d3d3db5a75...4c44cffd7b

Submodule qttools updated: 8575ed82ff...89d766d653