mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-18 12:56:43 +08:00
Compare commits
39 Commits
v5.13.0-al
...
v5.12.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7100c54887 | ||
|
|
3a1e557e54 | ||
|
|
091820f6a1 | ||
|
|
ffe8fd7701 | ||
|
|
becac559b7 | ||
|
|
83d5226604 | ||
|
|
9c60d8b190 | ||
|
|
b3b6b100e6 | ||
|
|
d5d380f452 | ||
|
|
6967ec6b73 | ||
|
|
80deae9b74 | ||
|
|
2dff8afa98 | ||
|
|
f64ba39ce5 | ||
|
|
ef7908d90c | ||
|
|
9df5188493 | ||
|
|
774f18e61a | ||
|
|
4f7c2120a7 | ||
|
|
4987a682ff | ||
|
|
bee2b8cdb9 | ||
|
|
3cb745565f | ||
|
|
92498bad9c | ||
|
|
8ba5474da7 | ||
|
|
54cdba9e3d | ||
|
|
6d90dd2191 | ||
|
|
c45f3395ee | ||
|
|
f5f03ebfcd | ||
|
|
1518bfdab6 | ||
|
|
92b7d48bc2 | ||
|
|
daf0d3a4c6 | ||
|
|
e8a1ca0581 | ||
|
|
22f032bd02 | ||
|
|
017d9e2ee3 | ||
|
|
3855853e34 | ||
|
|
da3ffbea17 | ||
|
|
616178cfb2 | ||
|
|
5256ac9c60 | ||
|
|
0f8243bce8 | ||
|
|
6d4cb1849a | ||
|
|
05c1f1cf99 |
80
.gitmodules
vendored
80
.gitmodules
vendored
@@ -1,60 +1,60 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -62,7 +62,7 @@
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -83,14 +83,14 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -123,185 +123,185 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.12
|
||||
branch = 5.12.2
|
||||
status = addon
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Template Target OS Target arch Compiler Target Compiler Features
|
||||
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
|
||||
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
|
||||
qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
|
||||
@@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10 Mingw73
|
||||
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
|
||||
3
coin/platform_configs/qtsaferenderer.txt
Normal file
3
coin/platform_configs/qtsaferenderer.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples
|
||||
@@ -1,4 +0,0 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
|
||||
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
@@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad"
|
||||
)
|
||||
|
||||
|
||||
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src"
|
||||
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
|
||||
|
||||
echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
|
||||
echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt
|
||||
|
||||
75
coin/provisioning/common/unix/install_protobuff.sh
Executable file
75
coin/provisioning/common/unix/install_protobuff.sh
Executable file
@@ -0,0 +1,75 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2018 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
# shellcheck source=./SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
|
||||
# This script will install Google's Protocal Buffers which is needed by Automotive Suite
|
||||
|
||||
version="3.6.1"
|
||||
sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
|
||||
internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
|
||||
externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
|
||||
|
||||
targetDir="$HOME/protobuf-$version"
|
||||
targetFile="$targetDir.zip"
|
||||
DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
|
||||
unzip "$targetFile" -d "$HOME"
|
||||
sudo rm "$targetFile"
|
||||
|
||||
# devtoolset is needed when running configuration
|
||||
if uname -a |grep -qv "Darwin"; then
|
||||
export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
|
||||
fi
|
||||
|
||||
echo "Configuring and building protobuf"
|
||||
cd "$targetDir"
|
||||
if uname -a |grep -q Darwin; then
|
||||
./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
|
||||
SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
|
||||
else
|
||||
./configure
|
||||
fi
|
||||
make
|
||||
sudo make install
|
||||
|
||||
# Refresh shared library cache if OS isn't macOS
|
||||
if uname -a |grep -qv "Darwin"; then
|
||||
sudo ldconfig
|
||||
fi
|
||||
|
||||
sudo rm -r "$targetDir"
|
||||
@@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination
|
||||
Remove-Item -Path $zip
|
||||
Remove-Item C:\Utils\openssl-$version.tar
|
||||
|
||||
Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
|
||||
Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
|
||||
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
|
||||
|
||||
# Make sure configure for openssl has a "make" and "perl" available
|
||||
$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
|
||||
|
||||
|
||||
@@ -4,16 +4,16 @@
|
||||
|
||||
$package = "DXSDK_Jun10.exe"
|
||||
|
||||
$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
|
||||
$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
|
||||
$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
|
||||
$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
|
||||
$exe = "C:\Windows\Temp\$package"
|
||||
|
||||
Download $officialUrl $cachedUrl $exe
|
||||
$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
|
||||
$package_path = "C:\Windows\Temp\$package"
|
||||
|
||||
Download $officialUrl $cachedUrl $package_path
|
||||
Verify-Checksum $package_path $sdkChecksumSha1 sha1
|
||||
Write-Host "Installing DirectX SDK"
|
||||
Run-Executable $exe "/u"
|
||||
Run-Executable $package_path "/u"
|
||||
|
||||
Remove-Item -Path $exe
|
||||
Remove-Item -Path $package_path
|
||||
|
||||
Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt
|
||||
|
||||
@@ -87,7 +87,7 @@ catch {
|
||||
git checkout $linux_syscall_support_commit_sha1
|
||||
}
|
||||
|
||||
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src"
|
||||
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
|
||||
|
||||
# Write HEAD commit sha to versions txt, so build can be repeated at later date
|
||||
Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
|
||||
|
||||
64
coin/provisioning/common/windows/install-protobuf.ps1
Normal file
64
coin/provisioning/common/windows/install-protobuf.ps1
Normal file
@@ -0,0 +1,64 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2019 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\helpers.ps1"
|
||||
|
||||
# This script will install Google's Protocol Buffers
|
||||
# Script requires Cmake to be installed and strawberry-perl not to be installed
|
||||
|
||||
$version = "3.6.1"
|
||||
$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
|
||||
$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
|
||||
$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip"
|
||||
$zip = "C:\Utils\protobuf-all-$version.zip"
|
||||
$installationFolder = "C:\Utils\protobuf"
|
||||
|
||||
Write-Host "Installing Protocol Buffers"
|
||||
Add-Path "C:\CMake\bin"
|
||||
Download "$officialUrl" "$cachedUrl" "$zip"
|
||||
Verify-Checksum "$zip" "$sha1"
|
||||
Extract-7Zip "$zip" C:\Utils
|
||||
New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build"
|
||||
New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release"
|
||||
New-Item -ItemType directory -Force -Path "$installationFolder"
|
||||
cd "C:\Utils\protobuf-$version\cmake\build\release"
|
||||
cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install"
|
||||
if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
|
||||
Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!"
|
||||
exit 1
|
||||
}
|
||||
|
||||
Remove-Item "$zip"
|
||||
|
||||
Add-Path "$installationFolder\bin"
|
||||
Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"
|
||||
Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib"
|
||||
40
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh
Executable file
40
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh
Executable file
@@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2018 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install_protobuff.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
|
||||
|
||||
40
coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh
Executable file
40
coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh
Executable file
@@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2018 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install_protobuff.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
|
||||
|
||||
@@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
|
||||
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
|
||||
{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null
|
||||
|
||||
iPhoneDeveloper="iosdevelopment.p12"
|
||||
shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
|
||||
iPhoneDeveloper="iosdevelopment_2019.p12"
|
||||
shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
|
||||
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
|
||||
echo "Importing $iPhoneDeveloper.."
|
||||
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
|
||||
|
||||
iPhoneDistribution="iosdistribution.p12"
|
||||
shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
|
||||
iPhoneDistribution="iosdistribution_2019.p12"
|
||||
shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
|
||||
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
|
||||
echo "Importing $iPhoneDistribution.."
|
||||
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-protobuf.ps1"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 77aa17d543...3de900a10c
Submodule qtactiveqt updated: abc831d8df...b918e20d4c
Submodule qtandroidextras updated: 82fbed7445...860fd4b991
2
qtbase
2
qtbase
Submodule qtbase updated: b1092a7d42...856fb1ab44
Submodule qtcanvas3d updated: 314464271c...f9b7e894b3
2
qtcharts
2
qtcharts
Submodule qtcharts updated: acbd92f90c...c9bc2672b5
Submodule qtconnectivity updated: 1bba269430...eec8fed760
Submodule qtdatavis3d updated: a0e8ef6caf...428195cb2b
Submodule qtdeclarative updated: 8fd3cfe7d0...cd7ce85ff0
2
qtdoc
2
qtdoc
Submodule qtdoc updated: b8e6b12840...ecc569fbcd
Submodule qtgamepad updated: 2826fb63aa...744e13b37b
Submodule qtgraphicaleffects updated: 64c479e151...41ab3587cf
Submodule qtimageformats updated: 50f6698117...1b8478f86f
Submodule qtlocation updated: b17c07dc0b...a00c5e40a2
Submodule qtmacextras updated: c8d6f78710...4509e67e22
Submodule qtmultimedia updated: 4e8e47989d...9caf4812e0
Submodule qtnetworkauth updated: c4ac0d5113...bd9c083ba0
Submodule qtpurchasing updated: 4e7e9fc7bc...2234141c0e
2
qtqa
2
qtqa
Submodule qtqa updated: 1de7f4634d...507202b4e7
Submodule qtquickcontrols updated: b1b68aa279...c231395eec
Submodule qtquickcontrols2 updated: fa4b1aa602...ca799283a2
Submodule qtremoteobjects updated: a6df9c84a6...1c19349a28
Submodule qtrepotools updated: bb13c8f9ce...f9c6da38f7
2
qtscript
2
qtscript
Submodule qtscript updated: 66f1a94aea...6c0edaf30c
2
qtscxml
2
qtscxml
Submodule qtscxml updated: f167b3cdb6...4bb7aa3f30
Submodule qtsensors updated: b6a72a4632...73d5160ab8
Submodule qtserialbus updated: 59f4eed65a...745120ddca
Submodule qtserialport updated: 1f1fa990f8...624f175492
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 420006184c...f899a4c205
2
qtsvg
2
qtsvg
Submodule qtsvg updated: ac797c4e17...2430c9ed20
2
qttools
2
qttools
Submodule qttools updated: a7bac5437c...b0147a5d79
Submodule qttranslations updated: 6431236ba6...c8a0da51ad
Submodule qtvirtualkeyboard updated: d08539bae3...277aad92fb
Submodule qtwayland updated: 9fbaa5c13c...0d717b0cc9
Submodule qtwebchannel updated: 45bc3ab0bb...45da510a0a
Submodule qtwebengine updated: 3f7ea91e23...92b078a534
Submodule qtwebglplugin updated: 737aa941f9...b1662da58d
Submodule qtwebsockets updated: 58dc09497d...b4bac09b3b
Submodule qtwebview updated: 161e4ec3af...0aa43dc555
Submodule qtwinextras updated: 92720ed84d...23dd448491
Submodule qtx11extras updated: d5a574ec94...3bfaa26890
Submodule qtxmlpatterns updated: 7998489142...e8026ec6a3
Reference in New Issue
Block a user