mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-07 23:46:51 +08:00
Compare commits
63 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d5ed0cde0 | ||
|
|
ab98909d73 | ||
|
|
5256e979fd | ||
|
|
6a4d5e4bc8 | ||
|
|
801066c40d | ||
|
|
e96f60a228 | ||
|
|
4e02d96116 | ||
|
|
0c66994ae9 | ||
|
|
ad474f110f | ||
|
|
30f22b8351 | ||
|
|
23824d231b | ||
|
|
777967f97b | ||
|
|
868e545eb2 | ||
|
|
9812986913 | ||
|
|
c07377e739 | ||
|
|
cef159accd | ||
|
|
a1ec8795c6 | ||
|
|
c41d854254 | ||
|
|
9b9801b7d4 | ||
|
|
3afd172a25 | ||
|
|
3963056f63 | ||
|
|
54f1bfd10c | ||
|
|
2aff311423 | ||
|
|
d61ac6c2f0 | ||
|
|
b7c2e9a846 | ||
|
|
3df0a5837c | ||
|
|
499c5390b3 | ||
|
|
a9752d68ed | ||
|
|
e23b244494 | ||
|
|
273e5b82cf | ||
|
|
7251401281 | ||
|
|
5758a88e59 | ||
|
|
e80d89059c | ||
|
|
a550ad21bf | ||
|
|
c80e96bb09 | ||
|
|
f05fece2f7 | ||
|
|
d9beab9abd | ||
|
|
20dcf55e7d | ||
|
|
53b920dc69 | ||
|
|
534d63e652 | ||
|
|
e785abbec1 | ||
|
|
211080722e | ||
|
|
30236c3f15 | ||
|
|
18e84e7c06 | ||
|
|
d4bb786963 | ||
|
|
fdf1b3cc8d | ||
|
|
c2549708e5 | ||
|
|
3fa8726fa7 | ||
|
|
81523d838c | ||
|
|
7a8c874231 | ||
|
|
e52c7efa4c | ||
|
|
c6d04d68bd | ||
|
|
4007fc7a26 | ||
|
|
2c53e3d08c | ||
|
|
b93073ecc9 | ||
|
|
d758a3b055 | ||
|
|
d2b26ede9c | ||
|
|
2051c2987e | ||
|
|
c485f3e4a7 | ||
|
|
7b30d85bdc | ||
|
|
e4ff528bb6 | ||
|
|
a2a6cf11a7 | ||
|
|
2068af50ca |
124
.gitmodules
vendored
124
.gitmodules
vendored
@@ -1,66 +1,66 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt qtwebkit
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
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.0
|
||||
branch = 5.7.0
|
||||
status = obsolete
|
||||
project = WebKit.pro
|
||||
priority = 20
|
||||
@@ -82,7 +82,7 @@
|
||||
depends = qtwebkit qttools
|
||||
path = qtwebkit-examples
|
||||
url = ../qtwebkit-examples.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = obsolete
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
@@ -96,21 +96,21 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
branch = 5.7
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
@@ -129,142 +129,184 @@
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
branch = 5.7
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtdeclarative qtimageformats
|
||||
recommends = qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.6.0
|
||||
status = preview
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtquick1"]
|
||||
depends = qtscript
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtquick1
|
||||
url = ../qtquick1.git
|
||||
branch = 5.6.0
|
||||
status = obsolete
|
||||
branch = 5.7.0
|
||||
status = ignore
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = essential
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = preview
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtenginio"]
|
||||
depends = qtdeclarative
|
||||
path = qtenginio
|
||||
url = ../qtenginio.git
|
||||
branch = 5.6.0
|
||||
status = deprecated
|
||||
branch = 5.7.0
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtquickcontrols qtwebchannel
|
||||
recommends = qtlocation
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.6.0
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtquickcontrols
|
||||
depends = qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.6.0
|
||||
status = preview
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad
|
||||
branch = 5.7.0
|
||||
status = preview
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml
|
||||
branch = 5.7.0
|
||||
status = preview
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech
|
||||
branch = dev
|
||||
status = ignore
|
||||
|
||||
9
coin/README
Normal file
9
coin/README
Normal file
@@ -0,0 +1,9 @@
|
||||
Continuous Integration
|
||||
======================
|
||||
|
||||
This directory contains files used by Qt's Continuous Integration system (Coin).
|
||||
|
||||
provisioning
|
||||
------------
|
||||
Contains scripts that apply to different test machines in order to run automatic tests on them.
|
||||
|
||||
31
coin/provisioning/common/helpers.ps1
Normal file
31
coin/provisioning/common/helpers.ps1
Normal file
@@ -0,0 +1,31 @@
|
||||
function Verify-Checksum
|
||||
{
|
||||
Param (
|
||||
[string]$File=$(throw("You must specify a filename to get the checksum of.")),
|
||||
[string]$Expected=$(throw("Checksum required")),
|
||||
[ValidateSet("sha1","md5")][string]$Algorithm="sha1"
|
||||
)
|
||||
$fs = new-object System.IO.FileStream $File, "Open"
|
||||
$algo = [type]"System.Security.Cryptography.$Algorithm"
|
||||
$crypto = $algo::Create()
|
||||
$hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "")
|
||||
$fs.Close()
|
||||
if ($hash -ne $Expected) {
|
||||
Write-Error "Checksum verification failed, got: '$hash' expected: '$Expected'"
|
||||
}
|
||||
}
|
||||
|
||||
function Extract-Zip
|
||||
{
|
||||
Param (
|
||||
[string]$Source,
|
||||
[string]$Destination
|
||||
)
|
||||
echo "Extracting '$Source' to '$Destination'..."
|
||||
|
||||
New-Item -ItemType Directory -Force -Path $Destination
|
||||
$shell = new-object -com shell.application
|
||||
$zipfile = $shell.Namespace($Source)
|
||||
$destinationFolder = $shell.Namespace($Destination)
|
||||
$destinationFolder.CopyHere($zipfile.Items())
|
||||
}
|
||||
7
coin/provisioning/common/jom.ps1
Normal file
7
coin/provisioning/common/jom.ps1
Normal file
@@ -0,0 +1,7 @@
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$zip = "c:\users\qt\downloads\jom_1_1_0.zip"
|
||||
|
||||
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
|
||||
Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
|
||||
Extract-Zip $zip C:\Utils\Jom
|
||||
70
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
Normal file
70
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
Normal file
@@ -0,0 +1,70 @@
|
||||
#!/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 installs the right ICU version
|
||||
|
||||
set -e
|
||||
icuVersion="56.1"
|
||||
icuLocation="/usr/lib64"
|
||||
sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
|
||||
|
||||
function Install7ZPackageFromURL {
|
||||
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"
|
||||
sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
|
||||
rm $targetFile
|
||||
}
|
||||
|
||||
echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
|
||||
|
||||
baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
|
||||
Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
|
||||
|
||||
echo "Installing custom ICU devel packages on RHEL"
|
||||
|
||||
sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
|
||||
develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
|
||||
tempDir=`mktemp -d` || echo "Failed to create temporary directory"
|
||||
trap "sudo rm -fr $tempDir" EXIT
|
||||
Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
|
||||
sudo cp -a $tempDir/lib/* /usr/lib64
|
||||
sudo cp -a $tempDir/* /usr/
|
||||
|
||||
sudo /sbin/ldconfig
|
||||
4
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh
Normal file
4
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
# provides: odbc devel packages on RHEL
|
||||
# version: provided by default Linux distribution repository
|
||||
# needed for configure -plugin-sql-odbc in qtbase
|
||||
sudo yum install -y unixODBC-devel
|
||||
@@ -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
|
||||
6
coin/provisioning/qtci-windows-10-x86/jom.ps1
Normal file
6
coin/provisioning/qtci-windows-10-x86/jom.ps1
Normal file
@@ -0,0 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
6
coin/provisioning/qtci-windows-10-x86_64/jom.ps1
Normal file
6
coin/provisioning/qtci-windows-10-x86_64/jom.ps1
Normal file
@@ -0,0 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
6
coin/provisioning/qtci-windows-7-x86/jom.ps1
Normal file
6
coin/provisioning/qtci-windows-7-x86/jom.ps1
Normal file
@@ -0,0 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
6
coin/provisioning/qtci-windows-8-x86/jom.ps1
Normal file
6
coin/provisioning/qtci-windows-8-x86/jom.ps1
Normal file
@@ -0,0 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
6
coin/provisioning/qtci-windows-8-x86_64/jom.ps1
Normal file
6
coin/provisioning/qtci-windows-8-x86_64/jom.ps1
Normal file
@@ -0,0 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
@@ -157,7 +157,10 @@ EOF
|
||||
use Carp qw( confess );
|
||||
use English qw( -no_match_vars );
|
||||
use Getopt::Long qw( GetOptions );
|
||||
use Cwd qw( getcwd );
|
||||
use Cwd qw( getcwd abs_path );
|
||||
|
||||
my $script_path = abs_path($0);
|
||||
$script_path =~ s,[/\\][^/\\]+$,,;
|
||||
|
||||
my $GERRIT_SSH_BASE
|
||||
= 'ssh://@USER@codereview.qt-project.org@PORT@/';
|
||||
@@ -330,26 +333,36 @@ sub git_clone_all_submodules
|
||||
|
||||
my %include = ();
|
||||
foreach my $mod (@subset) {
|
||||
my $del = ($mod =~ s/^-//);
|
||||
my $fail = 0;
|
||||
my @what;
|
||||
if ($mod eq "all") {
|
||||
map { $include{$_} = 1; } keys %subbases;
|
||||
@what = keys %subbases;
|
||||
} elsif ($mod eq "essential") {
|
||||
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
|
||||
@what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
|
||||
} elsif ($mod eq "addon") {
|
||||
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
|
||||
@what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
|
||||
} elsif ($mod eq "preview") {
|
||||
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
|
||||
@what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
|
||||
} elsif ($mod eq "deprecated") {
|
||||
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases;
|
||||
@what = grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases;
|
||||
} elsif ($mod eq "obsolete") {
|
||||
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
|
||||
} elsif ($mod =~ s/^-//) {
|
||||
@what = grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
|
||||
} elsif ($mod eq "ignore") {
|
||||
@what = grep { ($subinits{$_} || 0) eq 0 } keys %subbases;
|
||||
} elsif (defined($subdirs{$mod})) {
|
||||
push @what, $mod;
|
||||
} else {
|
||||
$fail = 1;
|
||||
}
|
||||
if ($del) {
|
||||
print "Warning: excluding non-existent module '$mod'.\n"
|
||||
if (!defined($subdirs{$mod}));
|
||||
delete $include{$mod};
|
||||
if ($fail);
|
||||
map { delete $include{$_} } @what;
|
||||
} else {
|
||||
die("Error: module subset names non-existent '$mod'.\n")
|
||||
if (!defined($subdirs{$mod}));
|
||||
$include{$mod} = 1;
|
||||
if ($fail);
|
||||
map { $include{$_} = 1; } @what;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -522,11 +535,16 @@ sub ensure_link
|
||||
return if (!$self->{'force-hooks'} and -f $tgt);
|
||||
unlink($tgt); # In case we have a dead symlink or pre-existing hook
|
||||
print "Aliasing $src\n as $tgt ...\n" if (!$self->{quiet});
|
||||
return if eval { symlink($src, $tgt) };
|
||||
if ($^O ne "msys" && $^O ne "MSWin32") {
|
||||
return if eval { symlink($src, $tgt) };
|
||||
}
|
||||
# Windows doesn't do (proper) symlinks. As the post_commit script needs
|
||||
# them to locate itself, we write a forwarding script instead.
|
||||
open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n";
|
||||
print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n";
|
||||
# Make the path palatable for MSYS.
|
||||
$src =~ s,\\,/,g;
|
||||
$src =~ s,^(.):/,/$1/,g;
|
||||
print SCRIPT "#!/bin/sh\nexec $src \"\$\@\"\n";
|
||||
close SCRIPT;
|
||||
}
|
||||
|
||||
@@ -534,19 +552,30 @@ sub git_install_hooks
|
||||
{
|
||||
my ($self) = @_;
|
||||
|
||||
return if (!-d 'qtrepotools/git-hooks');
|
||||
my $hooks = $script_path.'/qtrepotools/git-hooks';
|
||||
return if (!-d $hooks);
|
||||
|
||||
# Force C locale as git submodule returns the localized string "Entering"
|
||||
local $ENV{LC_ALL} = 'C';
|
||||
chomp(my @modules = `git submodule foreach :`);
|
||||
push @modules, "";
|
||||
for my $module (@modules) {
|
||||
$module =~ s,^Entering \'([^\']+)\'$,$1/,;
|
||||
my $rel = $module;
|
||||
$rel =~ s,[^/]+,..,g;
|
||||
$rel .= "../../qtrepotools/git-hooks/";
|
||||
$self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg');
|
||||
$self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit');
|
||||
my @configresult = qx(git config --list --local);
|
||||
foreach my $line (@configresult) {
|
||||
next if ($line !~ /submodule\.([^.=]+)\.url=/);
|
||||
my $module = $1.'/.git';
|
||||
if (!-d $module) {
|
||||
open GITD, $module or die "Cannot open $module: $!\n";
|
||||
my $gd = <GITD>;
|
||||
close GITD;
|
||||
chomp($gd);
|
||||
$gd =~ s/^gitdir: // or die "Malformed .git file $module\n";
|
||||
$module = $gd; # We expect it to be always absolute.
|
||||
if (open COMD, $module.'/commondir') {
|
||||
my $cd = <COMD>;
|
||||
chomp($cd);
|
||||
$module .= '/'.$cd;
|
||||
$module = abs_path($module);
|
||||
close COMD;
|
||||
}
|
||||
}
|
||||
$self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg');
|
||||
$self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 7a208d76ed...eb3fed53f7
Submodule qtactiveqt updated: ffa6ba6d81...d8d626498c
Submodule qtandroidextras updated: c2ca28adc0...c47369eab6
2
qtbase
2
qtbase
Submodule qtbase updated: d0cdc7ad1e...6c1e352803
Submodule qtcanvas3d updated: 5a17c4ca05...5f4845dbaa
1
qtcharts
Submodule
1
qtcharts
Submodule
Submodule qtcharts added at 0464d42b10
Submodule qtconnectivity updated: 8b550f0a75...344583c399
1
qtdatavis3d
Submodule
1
qtdatavis3d
Submodule
Submodule qtdatavis3d added at 643a6ad187
Submodule qtdeclarative updated: dc558b69f0...210617de78
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 2ed0ac4bbb...de0e539c44
Submodule qtenginio updated: 2a19257a5e...0f6e294fb8
Submodule qtfeedback updated: 862de791d7...28ca624149
1
qtgamepad
Submodule
1
qtgamepad
Submodule
Submodule qtgamepad added at 0295c81fdf
Submodule qtgraphicaleffects updated: 4b8e9a348c...55c13afa51
Submodule qtimageformats updated: 0bd46d5861...627666095f
Submodule qtlocation updated: ca4bce553d...f185e71635
Submodule qtmacextras updated: d8ebb7eeea...92faf5240f
Submodule qtmultimedia updated: 9985224a89...8a2c5887cc
2
qtpim
2
qtpim
Submodule qtpim updated: fa74ad6eda...de4cfc6b53
Submodule qtpurchasing updated: 951d75d744...60af17f3ab
2
qtqa
2
qtqa
Submodule qtqa updated: 683f523bcc...32893be6fa
2
qtquick1
2
qtquick1
Submodule qtquick1 updated: dcc5e5c01c...26229cfa0b
Submodule qtquickcontrols updated: 85c2d2cce4...b5a8306bf6
Submodule qtquickcontrols2 updated: 7fc567eda8...6b0fc95d09
Submodule qtrepotools updated: 333ca78f19...be3d47ae95
2
qtscript
2
qtscript
Submodule qtscript updated: a70f6a1b95...e2e7b57a5d
1
qtscxml
Submodule
1
qtscxml
Submodule
Submodule qtscxml added at 05e6410385
Submodule qtsensors updated: 7197e7f4b3...ea21a76606
Submodule qtserialbus updated: 48f3257259...f9201ca7ba
Submodule qtserialport updated: 03d492e49e...9b19e9ce6c
1
qtspeech
Submodule
1
qtspeech
Submodule
Submodule qtspeech added at ca8768b90c
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 38777ea745...d39db072e4
Submodule qtsystems updated: 37b614abbf...cc2077700b
2
qttools
2
qttools
Submodule qttools updated: 9904992dc4...4c1d5c0416
Submodule qttranslations updated: 41d212290c...8ac63b28c4
1
qtvirtualkeyboard
Submodule
1
qtvirtualkeyboard
Submodule
Submodule qtvirtualkeyboard added at 5e45faaf05
Submodule qtwayland updated: 29b8bd8b11...e0186e0090
Submodule qtwebchannel updated: 92d903d92b...23cd16ad67
Submodule qtwebengine updated: 5c4ae298b0...a833bc8e4e
2
qtwebkit
2
qtwebkit
Submodule qtwebkit updated: 81f43efbb2...01fa9be555
Submodule qtwebkit-examples updated: 7988aecdbc...f3f9e2a1b7
Submodule qtwebsockets updated: 88946bbe20...e7ba0d8e24
Submodule qtwebview updated: 847f8c40c1...e6a0bd8295
Submodule qtwinextras updated: b53d3a1e14...9bec22cb68
Submodule qtx11extras updated: d64ee96f0d...7163595b9a
Submodule qtxmlpatterns updated: de2dadb8af...8fdcecab85
Reference in New Issue
Block a user