mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-19 03:26:15 +08:00
Compare commits
18 Commits
v5.7.1
...
v5.8.0-alp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b7def1433 | ||
|
|
70361aac02 | ||
|
|
85771ddaaa | ||
|
|
31d8277404 | ||
|
|
7831d61e82 | ||
|
|
56fc6bc77b | ||
|
|
71524c78f6 | ||
|
|
b78f3579af | ||
|
|
80ee813a03 | ||
|
|
9410b99b16 | ||
|
|
7efeb26af7 | ||
|
|
23f5d41bec | ||
|
|
525a85bd6d | ||
|
|
acf5c9d0ff | ||
|
|
ca7708f22e | ||
|
|
f4c6a9c97c | ||
|
|
f78835e062 | ||
|
|
39a03d3d6a |
99
.gitmodules
vendored
99
.gitmodules
vendored
@@ -1,66 +1,66 @@
|
|||||||
[submodule "qtbase"]
|
[submodule "qtbase"]
|
||||||
path = qtbase
|
path = qtbase
|
||||||
url = ../qtbase.git
|
url = ../qtbase.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtsvg"]
|
[submodule "qtsvg"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtsvg
|
path = qtsvg
|
||||||
url = ../qtsvg.git
|
url = ../qtsvg.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtdeclarative"]
|
[submodule "qtdeclarative"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtsvg qtxmlpatterns
|
recommends = qtsvg qtxmlpatterns
|
||||||
path = qtdeclarative
|
path = qtdeclarative
|
||||||
url = ../qtdeclarative.git
|
url = ../qtdeclarative.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtactiveqt"]
|
[submodule "qtactiveqt"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtactiveqt
|
path = qtactiveqt
|
||||||
url = ../qtactiveqt.git
|
url = ../qtactiveqt.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtscript"]
|
[submodule "qtscript"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qttools
|
recommends = qttools
|
||||||
path = qtscript
|
path = qtscript
|
||||||
url = ../qtscript.git
|
url = ../qtscript.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = deprecated
|
status = deprecated
|
||||||
[submodule "qtmultimedia"]
|
[submodule "qtmultimedia"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtmultimedia
|
path = qtmultimedia
|
||||||
url = ../qtmultimedia.git
|
url = ../qtmultimedia.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qttools"]
|
[submodule "qttools"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtactiveqt qtwebkit
|
recommends = qtdeclarative qtactiveqt qtwebkit
|
||||||
path = qttools
|
path = qttools
|
||||||
url = ../qttools.git
|
url = ../qttools.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtxmlpatterns"]
|
[submodule "qtxmlpatterns"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtxmlpatterns
|
path = qtxmlpatterns
|
||||||
url = ../qtxmlpatterns.git
|
url = ../qtxmlpatterns.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qttranslations"]
|
[submodule "qttranslations"]
|
||||||
depends = qttools
|
depends = qttools
|
||||||
path = qttranslations
|
path = qttranslations
|
||||||
url = ../qttranslations.git
|
url = ../qttranslations.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = essential
|
status = essential
|
||||||
priority = 30
|
priority = 30
|
||||||
[submodule "qtdoc"]
|
[submodule "qtdoc"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
path = qtdoc
|
path = qtdoc
|
||||||
url = ../qtdoc.git
|
url = ../qtdoc.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = essential
|
status = essential
|
||||||
priority = 40
|
priority = 40
|
||||||
[submodule "qtrepotools"]
|
[submodule "qtrepotools"]
|
||||||
@@ -74,7 +74,7 @@
|
|||||||
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
|
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
|
||||||
path = qtwebkit
|
path = qtwebkit
|
||||||
url = ../qtwebkit.git
|
url = ../qtwebkit.git
|
||||||
branch = 5.7
|
branch = 5.8
|
||||||
status = obsolete
|
status = obsolete
|
||||||
project = WebKit.pro
|
project = WebKit.pro
|
||||||
priority = 20
|
priority = 20
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
depends = qtwebkit qttools
|
depends = qtwebkit qttools
|
||||||
path = qtwebkit-examples
|
path = qtwebkit-examples
|
||||||
url = ../qtwebkit-examples.git
|
url = ../qtwebkit-examples.git
|
||||||
branch = 5.7
|
branch = 5.8
|
||||||
status = obsolete
|
status = obsolete
|
||||||
[submodule "qtqa"]
|
[submodule "qtqa"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -93,17 +93,17 @@
|
|||||||
priority = 50
|
priority = 50
|
||||||
[submodule "qtlocation"]
|
[submodule "qtlocation"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
|
recommends = qtdeclarative qtquickcontrols qtserialport
|
||||||
path = qtlocation
|
path = qtlocation
|
||||||
url = ../qtlocation.git
|
url = ../qtlocation.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtsensors"]
|
[submodule "qtsensors"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtsensors
|
path = qtsensors
|
||||||
url = ../qtsensors.git
|
url = ../qtsensors.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtsystems"]
|
[submodule "qtsystems"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -136,177 +136,184 @@
|
|||||||
recommends = qtdeclarative qtandroidextras
|
recommends = qtdeclarative qtandroidextras
|
||||||
path = qtconnectivity
|
path = qtconnectivity
|
||||||
url = ../qtconnectivity.git
|
url = ../qtconnectivity.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwayland"]
|
[submodule "qtwayland"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtwayland
|
path = qtwayland
|
||||||
url = ../qtwayland.git
|
url = ../qtwayland.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qt3d"]
|
[submodule "qt3d"]
|
||||||
depends = qtdeclarative qtimageformats
|
depends = qtdeclarative qtimageformats
|
||||||
recommends = qtgamepad
|
recommends = qtgamepad
|
||||||
path = qt3d
|
path = qt3d
|
||||||
url = ../qt3d.git
|
url = ../qt3d.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtimageformats"]
|
[submodule "qtimageformats"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtimageformats
|
path = qtimageformats
|
||||||
url = ../qtimageformats.git
|
url = ../qtimageformats.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquick1"]
|
[submodule "qtquick1"]
|
||||||
depends = qtscript
|
depends = qtscript
|
||||||
recommends = qtsvg qtxmlpatterns
|
recommends = qtsvg qtxmlpatterns
|
||||||
path = qtquick1
|
path = qtquick1
|
||||||
url = ../qtquick1.git
|
url = ../qtquick1.git
|
||||||
branch = 5.7
|
branch = dev
|
||||||
status = ignore
|
status = ignore
|
||||||
[submodule "qtgraphicaleffects"]
|
[submodule "qtgraphicaleffects"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
path = qtgraphicaleffects
|
path = qtgraphicaleffects
|
||||||
url = ../qtgraphicaleffects.git
|
url = ../qtgraphicaleffects.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquickcontrols"]
|
[submodule "qtquickcontrols"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
recommends = qtgraphicaleffects
|
recommends = qtgraphicaleffects
|
||||||
path = qtquickcontrols
|
path = qtquickcontrols
|
||||||
url = ../qtquickcontrols.git
|
url = ../qtquickcontrols.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtserialbus"]
|
[submodule "qtserialbus"]
|
||||||
depends = qtserialport
|
depends = qtserialport
|
||||||
path = qtserialbus
|
path = qtserialbus
|
||||||
url = ../qtserialbus.git
|
url = ../qtserialbus.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = preview
|
status = addon
|
||||||
[submodule "qtserialport"]
|
[submodule "qtserialport"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtserialport
|
path = qtserialport
|
||||||
url = ../qtserialport.git
|
url = ../qtserialport.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtx11extras"]
|
[submodule "qtx11extras"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtx11extras
|
path = qtx11extras
|
||||||
url = ../qtx11extras.git
|
url = ../qtx11extras.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtmacextras"]
|
[submodule "qtmacextras"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtmacextras
|
path = qtmacextras
|
||||||
url = ../qtmacextras.git
|
url = ../qtmacextras.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwinextras"]
|
[submodule "qtwinextras"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtwinextras
|
path = qtwinextras
|
||||||
url = ../qtwinextras.git
|
url = ../qtwinextras.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtandroidextras"]
|
[submodule "qtandroidextras"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtandroidextras
|
path = qtandroidextras
|
||||||
url = ../qtandroidextras.git
|
url = ../qtandroidextras.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtenginio"]
|
[submodule "qtenginio"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
path = qtenginio
|
path = qtenginio
|
||||||
url = ../qtenginio.git
|
url = ../qtenginio.git
|
||||||
branch = 5.7
|
branch = dev
|
||||||
status = ignore
|
status = ignore
|
||||||
[submodule "qtwebsockets"]
|
[submodule "qtwebsockets"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtwebsockets
|
path = qtwebsockets
|
||||||
url = ../qtwebsockets.git
|
url = ../qtwebsockets.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwebchannel"]
|
[submodule "qtwebchannel"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtwebsockets
|
recommends = qtdeclarative qtwebsockets
|
||||||
path = qtwebchannel
|
path = qtwebchannel
|
||||||
url = ../qtwebchannel.git
|
url = ../qtwebchannel.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwebengine"]
|
[submodule "qtwebengine"]
|
||||||
depends = qtquickcontrols qtwebchannel
|
depends = qtquickcontrols qtwebchannel
|
||||||
recommends = qtlocation
|
recommends = qtlocation
|
||||||
path = qtwebengine
|
path = qtwebengine
|
||||||
url = ../qtwebengine.git
|
url = ../qtwebengine.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
priority = 10
|
priority = 10
|
||||||
[submodule "qtcanvas3d"]
|
[submodule "qtcanvas3d"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
path = qtcanvas3d
|
path = qtcanvas3d
|
||||||
url = ../qtcanvas3d.git
|
url = ../qtcanvas3d.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwebview"]
|
[submodule "qtwebview"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
recommends = qtwebengine
|
recommends = qtwebengine
|
||||||
path = qtwebview
|
path = qtwebview
|
||||||
url = ../qtwebview.git
|
url = ../qtwebview.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquickcontrols2"]
|
[submodule "qtquickcontrols2"]
|
||||||
depends = qtgraphicaleffects
|
depends = qtgraphicaleffects
|
||||||
path = qtquickcontrols2
|
path = qtquickcontrols2
|
||||||
url = ../qtquickcontrols2.git
|
url = ../qtquickcontrols2.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtpurchasing"]
|
[submodule "qtpurchasing"]
|
||||||
depends = qtbase qtandroidextras
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtpurchasing
|
path = qtpurchasing
|
||||||
url = ../qtpurchasing.git
|
url = ../qtpurchasing.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtcharts"]
|
[submodule "qtcharts"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtcharts
|
path = qtcharts
|
||||||
url = ../qtcharts.git
|
url = ../qtcharts.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtdatavis3d"]
|
[submodule "qtdatavis3d"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtdatavis3d
|
path = qtdatavis3d
|
||||||
url = ../qtdatavis3d.git
|
url = ../qtdatavis3d.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtvirtualkeyboard"]
|
[submodule "qtvirtualkeyboard"]
|
||||||
depends = qtbase qtdeclarative qtsvg
|
depends = qtbase qtdeclarative qtsvg
|
||||||
recommends = qtmultimedia qtquickcontrols
|
recommends = qtmultimedia qtquickcontrols
|
||||||
path = qtvirtualkeyboard
|
path = qtvirtualkeyboard
|
||||||
url = ../qtvirtualkeyboard.git
|
url = ../qtvirtualkeyboard.git
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtgamepad"]
|
[submodule "qtgamepad"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtgamepad
|
path = qtgamepad
|
||||||
url = ../qtgamepad
|
url = ../qtgamepad
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = preview
|
status = preview
|
||||||
[submodule "qtscxml"]
|
[submodule "qtscxml"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtscxml
|
path = qtscxml
|
||||||
url = ../qtscxml
|
url = ../qtscxml
|
||||||
branch = 5.7.1
|
branch = 5.8
|
||||||
status = preview
|
status = addon
|
||||||
[submodule "qtspeech"]
|
[submodule "qtspeech"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtspeech
|
path = qtspeech
|
||||||
url = ../qtspeech
|
url = ../qtspeech
|
||||||
branch = dev
|
branch = 5.8
|
||||||
status = ignore
|
status = preview
|
||||||
|
[submodule "qtnetworkauth"]
|
||||||
|
depends = qtbase
|
||||||
|
recommends = qtwebview
|
||||||
|
path = qtnetworkauth
|
||||||
|
url = ../qtnetworkauth
|
||||||
|
branch = 5.8
|
||||||
|
status = preview
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -29,32 +29,3 @@ function Extract-Zip
|
|||||||
$destinationFolder = $shell.Namespace($Destination)
|
$destinationFolder = $shell.Namespace($Destination)
|
||||||
$destinationFolder.CopyHere($zipfile.Items(), 16)
|
$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)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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"
|
|
||||||
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\cmake.ps1"
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\python.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\ruby.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\cmake.ps1"
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\python.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\ruby.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\python.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\python.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
. "$PSScriptRoot\..\common\python.ps1"
|
|
||||||
2
qt3d
2
qt3d
Submodule qt3d updated: 0eac16fbda...5688464a38
Submodule qtactiveqt updated: 67dcd1a1b5...45cd9f66f4
Submodule qtandroidextras updated: 2622247a0c...c944c05ca4
2
qtbase
2
qtbase
Submodule qtbase updated: a55f36211e...982f17e961
Submodule qtcanvas3d updated: 8e34d6f539...a04083615e
2
qtcharts
2
qtcharts
Submodule qtcharts updated: da07182524...1444743488
Submodule qtconnectivity updated: d884d20c55...ee177fa9cd
Submodule qtdatavis3d updated: 2523056490...b6c5569f21
Submodule qtdeclarative updated: 2a992040e2...c13aa48d4c
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 79ed30f70c...cb23e64e86
Submodule qtdocgallery updated: 2da36eb615...e36e6f0abd
Submodule qtenginio updated: 15090ec536...b0ad5907f4
Submodule qtfeedback updated: 28ca624149...9ac8d8c272
Submodule qtgamepad updated: e5066759bf...f4bd1e2687
Submodule qtgraphicaleffects updated: f536e36e31...8b5cb6185a
Submodule qtimageformats updated: 11300c62aa...d3ac5245d0
Submodule qtlocation updated: de5be121d8...d999495a01
Submodule qtmacextras updated: 237ad2f2f0...e0e5a57430
Submodule qtmultimedia updated: e4aef963cb...29232a2bc2
1
qtnetworkauth
Submodule
1
qtnetworkauth
Submodule
Submodule qtnetworkauth added at 0cb5de9c28
2
qtpim
2
qtpim
Submodule qtpim updated: de4cfc6b53...02efef5ee6
Submodule qtpurchasing updated: 52910f6a43...4aa95af070
2
qtqa
2
qtqa
Submodule qtqa updated: cd6bd18319...1c973844b7
2
qtquick1
2
qtquick1
Submodule qtquick1 updated: 26229cfa0b...92c847e56d
Submodule qtquickcontrols updated: 84b3cf1c04...e516c88c48
Submodule qtquickcontrols2 updated: 6f6e073815...67f67f2cc6
Submodule qtrepotools updated: 973462d65b...471da8d402
2
qtscript
2
qtscript
Submodule qtscript updated: 42f94f3048...059fc10f8f
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 63ec7e2ff9...90b000155e
Submodule qtsensors updated: 5a57beaaa5...0032fd6150
Submodule qtserialbus updated: 768b2d4636...fa54696446
Submodule qtserialport updated: 0b9f41c28c...df8d69c000
2
qtspeech
2
qtspeech
Submodule qtspeech updated: ca8768b90c...577060af2d
2
qtsvg
2
qtsvg
Submodule qtsvg updated: d3d3db5a75...4c44cffd7b
Submodule qtsystems updated: cc2077700b...434af789f0
2
qttools
2
qttools
Submodule qttools updated: 8575ed82ff...89d766d653
Submodule qttranslations updated: c4795ce81f...64f3b105fb
Submodule qtvirtualkeyboard updated: 5ac6b611b1...2d9cb8747c
Submodule qtwayland updated: 4b23163fb6...b0c416dede
Submodule qtwebchannel updated: 31eb0d8c7d...bf66a8531e
Submodule qtwebengine updated: 9cc97f0c63...9cda8d4384
2
qtwebkit
2
qtwebkit
Submodule qtwebkit updated: b9ce7cfc7f...5b94fe36c9
Submodule qtwebkit-examples updated: 1ac4ee2402...1a839b5056
Submodule qtwebsockets updated: 60cede232a...94a1fe0b12
Submodule qtwebview updated: 61c2a76cf0...c403171094
Submodule qtwinextras updated: 2242619275...3393a78af1
Submodule qtx11extras updated: d311bf931b...6143e155ad
Submodule qtxmlpatterns updated: 89dbcc4f80...0171940a53
Reference in New Issue
Block a user