Compare commits

..

52 Commits
5.15.2 ... 5.15

Author SHA1 Message Date
Tarja Sundqvist
2c7b48ab7d Merge Qt 5.15.18 opensource release
Change-Id: Ia40291ab456a5a79c26c05c72b44788ad35ca350
2025-10-31 16:49:20 +02:00
Tarja Sundqvist
511a466f09 Merge Qt 5.15.17 opensource release
Change-Id: If36c1537ec7eb70133a420b7381a29daf39c680e
2025-05-20 12:10:20 +03:00
Tarja Sundqvist
a322983267 Merge Qt 5.15.16 opensource release
Change-Id: I5298e168f837796fc223b6c51464c37adda74df7
2024-11-16 14:19:30 +02:00
Tarja Sundqvist
e4ca9dfa71 Merge Qt 5.15.15 opensource release
Change-Id: I6cbd1e72b82857fac02f1bee866e20ff47b751d1
2024-08-30 15:11:48 +03:00
Tarja Sundqvist
e6c2b7b264 Merge Qt 5.15.14 opensource release
Change-Id: I8f66072d46fb4e8e85411fd93bbc85a336e06f60
2024-05-24 22:51:21 +03:00
Tarja Sundqvist
0cbeef31b8 Merge Qt 5.15.13 opensource release
Change-Id: If178ddbd84f1d56220fb1dd2cba3876764190598
2024-03-08 11:34:13 +02:00
Tarja Sundqvist
c54886aa2c Merge Qt 5.15.12 opensource release
Change-Id: I0237802dd988289a6548a86b3d9884d00ad6d841
2023-12-20 13:07:55 +02:00
Tarja Sundqvist
6508627d50 Merge Qt 5.15.11 opensource release
Change-Id: I5b8c7c55a5ab3c4e0c1df5876c00031a33366599
2023-10-04 18:18:50 +03:00
Tarja Sundqvist
da2e0a59fa Merge Qt 5.15.10 opensource release
Change-Id: Idcdec5e59815996a2b614f0e3cde32063a4c39cf
2023-06-06 22:04:17 +03:00
Tarja Sundqvist
b9fd0a20a6 Merge Qt 5.15.9 opensource release
Change-Id: I4524ceddd2a4c766d86328d4d3d099a42a336a44
2023-04-05 23:56:17 +03:00
Tarja Sundqvist
3c61a77b7f Merge Qt 5.15.8 opensource release
Change-Id: I94326f4288b4f8ed013a1f24a27d593aae4ef86e
2023-01-03 19:38:49 +02:00
Tarja Sundqvist
95254e52c6 Merge Qt 5.15.7 opensource release
Change-Id: If618dd6e51b8144be8373d7ccc0518a05dbc8cd5
2022-10-27 15:19:00 +03:00
Tarja Sundqvist
6e27fd5679 Release Qt 5.15.6 opensource
Releasing Qt 5.15.6 opensource to the public 5.15 branch.

Change-Id: I4c7b5b3a692b6f25e32523f6a7c76f53d230e1b7
2022-09-07 13:47:25 +03:00
Tarja Sundqvist
9039ca53a3 Merge Qt 5.15.5 opensource release
Change-Id: Ibf0dfbd2eeb20674380382a87876d44062f2b67f
2022-06-16 22:31:38 +03:00
Tarja Sundqvist
45624b631f Merge Qt 5.15.4 release to the public 5.15 branch
Merge the Qt 5.15.4 release that is tagged with the v5.15.4-lts-lgpl tag.

Change-Id: I6564af2fd851f5cebe88781153da53979244ca50
2022-05-09 19:30:14 +03:00
Tarja Sundqvist
b78a4dc893 Merge Qt 5.15.3 Opensource release
Merge of the v5.15.3-lts-lgpl tag.

Change-Id: I87eabbc5d9e960e2afb74574c603067480d0468f
2022-03-02 18:04:45 +02:00
Simo Fält
f68f1a89f3 Provisioning: Fix dynamic libclang libs install
Cherry-pick from dev branch introduced unnecessary file but also missed
two configurations.
This change amends c5378f6cd6

Change-Id: I42bf3cabcd39b4acf8db623a08f52e06f06a6562
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-01-04 10:34:48 +02:00
Allan Sandfeld Jensen
0c6aa06e0c Provisioning: Fix Nodejs12 Path for RedHat
The path included the executable by accident.

Change-Id: If477914a7313987796a952a05e9eecba7fdaf9c2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-01-04 09:31:32 +01:00
Heikki Halmet
88c2d05f5d Provisioning: Install Nodejs version 10 for QtWebengine
Task-number: QTQAINFRA-4057
Change-Id: I6f476db59ee8fdb13d37a22fdd878c3db1fd1594
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-04 06:14:37 +00:00
Qt Submodule Update Bot
6cafc37486 Update submodules on '5.15' in qt/qt5
Change-Id: Ica19534090a17021ed9738ef8f86fed6453cfc1c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-31 23:45:48 +01:00
Simo Fält
a27fe44a4e Provisioning: Remove deprecated brew call
Change-Id: If956d0f77cd5c6763fc2314277c346d8f27e6eee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 0350263a07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-30 18:59:30 +02:00
Simo Fält
c5378f6cd6 Provisioning: Install libClang 10 with dynamic libs
As Qt uses only static archives of libclang, we have to install
dynamic version as an additional package. Libclang is required
for example QtForPython.

Change-Id: Ic9d70398113defe3561f261aee369b423c18686a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b792fd56db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-30 16:59:27 +00:00
Simo Fält
bac86c9fba Provisioning: Fix installing nodejs and libusb to MacOS 10.13
Brew doesn't provide pre built binaries of nodejs nor libusb
for 10.13.

Change-Id: I9e8b47dbbfde05fc38661df6c834b0ff3f2754f2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-30 18:59:23 +02:00
Qt Submodule Update Bot
4d4a4649a9 Update submodules on '5.15' in qt/qt5
Change-Id: I92945765f109c0710700191b7f0521a232749d39
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-29 23:45:50 +01:00
Heikki Halmet
b815911d7a Update Windows 10 x86_64 version to 20H2
Windows 10 Enterprise 20H2, OS build 19042.508
Additional SW:
MSVC 2019 version 16.8.1
MSVC 2019 Build Tools version 16.8.1
MSVC 2015 14.0.25420.1
Virtio driver
Virtio Balloon driver
NetKVM driver
Vioserial driver
Guest-agent qemu-ga-x86_64

Task-number: QTQAINFRA-3961
Change-Id: I8abc7ac011c58ad13db433fc86a1327afceafc68
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 420d7f809c)
2020-12-22 16:45:48 +02:00
Tony Sarajärvi
8da32f0dc9 Bring back the -no-gui build in the CI
Task-number: QTQAINFRA-3999
Change-Id: I8e36d0b98c1d6062bf8bdf67eccba0727cb4bedc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-22 14:05:58 +00:00
Heikki Halmet
343e4a793c Provisioning: Fix GCC installation for linux
Pre-built package was missing from cache and source package
was named as pre-built package

Change-Id: I6d14b198ab7e3795e5f70986c9a50662225ac666
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 4aa14ea9d7)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-21 07:50:17 +02:00
Heikki Halmet
15e9dd1c7c Change installation order in macOS 10.13
Nodejs installation fails with dependencies because symlinks already
exists. Let's install homebrew and nodejs first before xz and python3.
Also Opennebula installation needs to be before Nodejs installation,
because brew will install another Openssl version as dependecy for
nodejs and it can cause conflicts.

Task-number: QTQAINFRA-4105
Change-Id: Ieea94eb118b5f2b71381ee24b8602e76813e35ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-12-21 07:50:15 +02:00
Heikki Halmet
bf9b9f9b98 Update macOS 10.13 Tier1 image
Software updates are disabled from tier1 image.
It seems, that without this macOS 10.13 keep on crashing.
This is related to QTQAINFRA-4104

Change-Id: I92f0039102d93268358301bfb789765ca39fd1ae
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9a00450454)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-12-21 07:50:13 +02:00
Qt Submodule Update Bot
ec0fff7cbb Update submodules on '5.15' in qt/qt5
Change-Id: Ifdf51b8ea5f9ccc48f1db4314881c5a6f8c5cbdd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-21 06:50:12 +01:00
Allan Sandfeld Jensen
9610630e2b Fix nodejs installation on windows
Was unpacked into a subdirectory with the same name as the archive

Fixes: QTQAINFRA-4055
Change-Id: Ic11d2d926a1d2250b963010729d70bd00b992f89
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit e38fc45740)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-12 15:10:23 +00:00
Allan Sandfeld Jensen
0a33a4152a Add glproto-devel to openSUSE for webengine
We now need glxtokens.h

Change-Id: I55bc2d195cb27b53ff0a2573e558e4cd40e67451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d5eeee1cd2)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2020-12-12 16:10:20 +01:00
Heikki Halmet
7347237816 Provisioning: Add Nodejs12 to Path for RedHat
Nodejs will not be installed under /opt/rh/devtoolset-4/ but instead
under /opt/rh/rh-nodejs12 which means it needs to be added to PATH
separately

Change-Id: Ic7acbfaead866a89e03811ecdca2a7caf8476546
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2020-12-11 18:54:58 +02:00
Heikki Halmet
915cb775ce Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8846d0d52d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-09 06:24:39 +00:00
Heikki Halmet
73fe0e7cf0 Provisioning: Install Azure tool
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit cdea442a3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-09 06:24:37 +00:00
Qt Submodule Update Bot
c9f70d8261 Update submodules on '5.15' in qt/qt5
Change-Id: I0836f0e04442d0292569addc548cdf586ae52ba9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-06 23:46:00 +01:00
Qt Submodule Update Bot
ffbb05cb80 Update submodules on '5.15' in qt/qt5
Change-Id: I34615557d90d3f2048c4210c998f0d196d06b0cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-04 01:36:11 +01:00
Qt Submodule Update Bot
dc0c9cdff6 Update submodules on '5.15' in qt/qt5
Change-Id: Ia4c514497ce053b0e17fcd6a914857faea8b8254
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-02 05:48:57 +01:00
Qt Submodule Update Bot
5e37f2de20 Update submodules on '5.15' in qt/qt5
Change-Id: I25dc2eacfeee6220d7302424301688ab8458086b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-30 19:43:52 +01:00
Assam Boudjelthia
790420ae01 Android: update build tools and SDK level to 29 in CI
Change-Id: I6f831882f1e4c2ba68cbd70d03b72a9337211fbf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 9b5c3f0a6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-24 17:36:43 +00:00
Heikki Halmet
16955af5b4 Provisioning: Remove rogue RHEL 7.4 provisioning file
RedHat 7.4 isn't supported in 6.0 or in 5.15 branches

Change-Id: Ia3ad450a944884035ec3a822e09f73c6970450d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c20aba6f04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-21 09:43:24 +00:00
Johanna Äijälä
09071b67bf Add missing Squish installation to win10 x86 Squish archive
Win10 x86 archive was missing msvc142 x86 package.

Change-Id: I532c3a1129d75968c22b721390ff474548e642bf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b43c199d4a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-17 06:09:41 +00:00
Qt Submodule Update Bot
f3b2ba1f10 Update submodules on '5.15' in qt/qt5
Change-Id: I8b229e7e25cb62dfca2872df381b429cc8b93cdd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-15 23:46:14 +01:00
Qt Submodule Update Bot
7679fdac8f Update submodules on '5.15' in qt/qt5
Change-Id: I246afdd7216da01980bbbc22419e3d47ce3176d4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-13 06:16:52 +01:00
Qt Submodule Update Bot
a70656119d Update submodules on '5.15' in qt/qt5
Change-Id: I041cd62fc7e88209a894e4b2651e4eb9b5095723
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-12 10:19:25 +01:00
Qt Submodule Update Bot
5657cb2518 Update submodules on '5.15' in qt/qt5
Change-Id: Ife4a9e421022b542cdcef7959f168019da3fa669
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-10 07:05:23 +01:00
Qt Submodule Update Bot
75feb54bcc Update submodules on '5.15' in qt/qt5
Change-Id: I80f745d26270f0cdfe56519f5dab6e15e2e84761
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-06 19:08:34 +00:00
Heikki Halmet
114fc83609 Provisioning: Update MSVC 2019 to version 16.7.5
Visual Studio 2019 can be updated with version specific online installer

Change-Id: I1ec1f96e68e8e3440d85240d09eec59a421708db
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b9158ca889)
2020-11-04 14:53:31 +03:00
Heikki Halmet
9f39df9e30 Upgrade msys2 package and the installation script
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 134c2a1cb0)
2020-11-04 13:53:29 +02:00
Heikki Halmet
42d631229b Provisioning: Add system GCC versions to versions.txt
Currently GCC versions which comes with the system are missing from
versions.txt. This change will add those

Task-number: QTQAINFRA-3933
Change-Id: I1934e6257acf92d72dcb382884aad60503b7b32f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dff15e0a71)
2020-11-01 11:16:01 +03:00
Heikki Halmet
d562974cb8 Provisioning: Enable access to SMB server in Windows 10 x64
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Task-number: QTQAINFRA-3980
Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 586856e180)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-10-29 08:24:25 +00:00
Heikki Halmet
8b17964ab1 Remove DisableTest flag from MinGW builds
We should have tests up and running for those targets we are doing
prebuild binaries.

Task-number: QTBUG-74542
Change-Id: I7bdc0f324ed7d35aa8bc329af4c9d11e641d9979
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2020-10-27 13:04:02 +03:00
89 changed files with 536 additions and 260 deletions

84
.gitmodules vendored
View File

@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.15.2
branch = 5.15
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.15.2
branch = 5.15
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.15.2
branch = 5.15
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.15.2
branch = 5.15
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.15.2
branch = 5.15
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.15.2
branch = 5.15
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.15.2
branch = 5.15
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
branch = 5.15.2
branch = 5.15
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,99 +123,99 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.15.2
branch = 5.15
status = essential
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.15.2
branch = 5.15
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.15.2
branch = 5.15
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 5.15.2
branch = 5.15
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = 5.15.2
branch = 5.15
status = addon

View File

@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
@@ -11,32 +11,32 @@ Configurations:
Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target arch: 'x86'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
@@ -48,6 +48,11 @@ Configurations:
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
@@ -81,7 +86,7 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
-
Template: 'qtci-macos-10.13-x86_64-2'
Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'

View File

@@ -2,12 +2,12 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']

View File

@@ -2,13 +2,13 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2015'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-macos-10.13-x86_64-2'
Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'

View File

@@ -1,13 +1,13 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2019'
@@ -17,29 +17,29 @@ Configurations:
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
Features: ['Packaging', 'DisableTests']
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests']
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Mingw'
@@ -48,7 +48,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
-
Template: 'qtci-macos-10.13-x86_64-2'
Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Clang'
@@ -56,14 +56,14 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64'
-
Template: 'qtci-macos-10.13-x86_64-2'
Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'QNX_700'
Target arch: 'x86'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'Mingw'
@@ -71,7 +71,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'Mingw'
@@ -79,7 +79,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'Mingw'
@@ -101,14 +101,14 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
-
Template: 'qtci-macos-10.13-x86_64-2'
Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'WebAssembly'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']

View File

@@ -13,7 +13,7 @@
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'

View File

@@ -1,5 +1,5 @@
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'

View File

@@ -1,33 +1,18 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
Features: ['Packaging', 'DisableTests']
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -static -no-icu'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Environment variables: ['PATH=C:\MINGW730\mingw32\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'

View File

@@ -2,12 +2,12 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-10-x86_64-51'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-macos-10.13-x86_64-2'
Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'

View File

@@ -1,12 +1,5 @@
# List about manual pre-installations to Tier1 image:
Virtual Hardware:
CPU: 4
Memory: 8 GB
Hard Disk: 550 GB
CI_NW
Video Card - total memory: 32MB
VM Options:
Boot options/Firmware: BIOS
@@ -18,6 +11,14 @@ Windows 10 Enterprise
Region: Finland
Keyboard layout: United Kingdom
* Don't use online speech recognition
* Let Microsoft and apps use your location: no
* Find my devicer: no
* Send diagnostic data to Microsoft: Send required diagnostic data
* Imporve inking & typing: no
* Get tailored expreriences with diagnostic data: no
* Let apps use advertising ID: no
* VMware tools (complete) installed
* Resolution set to 1280x800
* Coin-setup:
@@ -45,12 +46,7 @@ Keyboard layout: United Kingdom
* (Restart Windows)
* Google Chrome installed for RTA
* Virus & threat protection settings:
- Real-time protection -> off
- Cloud-delivered protection -> off
- Automatic sample submission -> off
- Tamper protection -> off
* Virus & threat protection notifications:
- Get informational notifications -> off
- Account protection notifications -> off
* Check that there's no active antivirus providers
* From 'Region Settings'
* Set Regional format: English (United States)
* Activate Windows

View File

@@ -1,6 +1,6 @@
###########################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,18 +44,6 @@
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"
# 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"
# 'Windows Defender Cleanup' - "Periodic cleanup task."
DisableSchedulerTask "Windows Defender\Windows Defender Cleanup"
# 'Windows Defender Scheduled Scan' - "Periodic scan task."
DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan"
# 'Windows Defender Verification' - "Periodic verification task."
DisableSchedulerTask "Windows Defender\Windows Defender Verification"
# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports."
DisableSchedulerTask "Windows Error Reporting\QueueReporting"

View File

@@ -0,0 +1,18 @@
# Visual Studio $version was installed manually using $installer.
$version = "2015 update 3"
$version_number ="14.0.25420.1"
$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"
# default plus following components were selected:
# * Programming Languages
# * Visual C++
# - Common Tools for Visual C++ 2015
# * Universal Windows App Development Tools
# - Tools (1.4.1) and Windows SDK (10.0.14393)
# - Windows 10 SDK (10.0.10586)
# - Windows 10 SDK (10.0.10240)
# * Common Tools
# -Visual Studio Extensibility Tools Update 3
# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"

View File

@@ -2,13 +2,13 @@
$version = "2019"
# Current version was manually upgraded from the installer
$version_number = "16.6.2"
$version_number = "16.8.1"
$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
MSVC 2019 build tools (default installation, no additional selections).
* Install after MSVC2019 is installed!
* Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
* Version: 16.6.2
* Version: 16.8.1
Installed MSVC-2019 Components:
@@ -38,10 +38,10 @@ Text Template Transformation
C# and Visual Basic Roslyn compilers
C++ 2019 Redistributable Update
C++ Cmake tools for Windows
C++/CLI support for v142 build tools /14.26)
C++/CLI support for v142 build tools /14.28)
MSBuild
MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
MSVC v142 - VS 2019 C++ ARM build tools (v14.26)
MSVC v142 - VS 2019 C++ ARM build tools (v14.28)
MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26)
MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
@@ -57,7 +57,7 @@ Razor Language Services
Graphics debugger and GPU profiler for DirectX
Image and 3D model editors
C++ ATL for latest v142 build tools (x86 & x64)
TypeScript 3.8 SDK
TypeScript 4.0 SDK
Windows 10 SDK (10.0.16299.0)
Windows 10 SDK (10.0.17134.0)
Windows 10 SDK (10.0.17763.0)

View File

@@ -4,18 +4,22 @@ Our vanilla images are pre-installed in VMware where we have networking availabl
use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch
to using the VirtIO NIC in KVM.
* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso
* Mount virtio-win-0.1.171.iso by double clicking it.
NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso
cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso
* Mount virtio-win-0.1.185.iso by double clicking it.
* Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
* Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
* Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install
* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install
* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64
Because vioscsi does not install the entries in windows registry before we actually
have a VirtIO device installed, and we can't boot with a VirtIO device before
the driver is installed, we have to blindly install the registry entries:
* Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
However, we've seen that the Owner in the registry can be wrong. This entry
sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

View File

@@ -55,8 +55,8 @@ toolsVersion="r26.1.1"
toolsFile="sdk-tools-linux-4333796.zip"
ndkVersion="r20"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-28"
sdkBuildToolsVersion="29.0.3"
sdkApiLevel="android-29"
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"

View File

@@ -37,7 +37,7 @@
set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
brew install libusb
brew install --build-from-source libusb
read -r -a arr <<< $(brew list --versions libusb)
version=${arr[1]}
echo "libusb = $version" >> ~/versions.txt

View File

@@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt
echo "***** All installed packages *****" >> ~/versions.txt
echo "***** HomeBrew *****" >> ~/versions.txt
brew list --versions >> ~/versions.txt
echo "***** HomeBrew Casks*****" >> ~/versions.txt
brew cask list --versions >> ~/versions.txt
echo "***** Apple's installer *****" >> ~/versions.txt
pkgutil --pkgs >> ~/versions.txt
echo "*********************************************" >> ~/versions.txt

View File

@@ -0,0 +1,83 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 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$
##
#############################################################################
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 3.9 or higher is required for building.
# This same script is used to provision libclang to Linux and macOS.
# In case of Linux, we expect to get the values as args
set -e
# shellcheck source=./check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
libclang_version=10.0
if uname -a |grep -q Darwin; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-mac.7z"
sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
elif test -f /etc/redhat-release || /etc/centos-release; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
sha1="1d2e265502fc0832a854f989d757105833fbd179"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
else
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
sha1="c1580acb3a82e193acf86f18afb52427c5e67de8"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
fi
zip="/tmp/libclang.7z"
destination="/usr/local/libclang-dynlibs-$version"
DownloadURL $url_cached $url $sha1 $zip
if command -v 7zr &> /dev/null; then
sudo 7zr x $zip -o/usr/local/
else
sudo 7z x $zip -o/usr/local/
fi
sudo mv /usr/local/libclang "$destination"
rm -rf $zip
echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile
echo "libClang for QtForPython= $version" >> ~/versions.txt

View File

@@ -1,2 +1,2 @@
Disable-NetAdapterLso Ethernet
Disable-NetAdapterLso "Ethernet 2"
Start-Sleep -s 15 # Give windows some time to adjust network settings

View File

@@ -1,8 +1,6 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -32,8 +30,11 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
set -ex
# This script will install Azure singtool using Dotnet SDK
$dotnet = "C:\Program Files\dotnet\dotnet.exe"
$version = "2.0.17"
Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version"
# shellcheck source=../common/unix/python-modules.sh
source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh"

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -30,23 +30,30 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# Visual Studio $version was installed manually using $installer.
$version = "2015 update 3"
$version_number ="14.0.25420.1"
$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"
# This script will install Dotnet SDK which is required for Azure installation
$version = "2.1"
if (Is64BitWinHost) {
$urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe"
$urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe"
$sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8"
} else {
$urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe"
$urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe"
$sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161"
}
$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe"
Write-Host "Installing Dotnet SDK $version"
Download $urlOfficial $urlCache $installer
Verify-Checksum $installer $sha1
Run-Executable "$installer" "/install /passive"
Prepend-Path "C:\Program Files\dotnet"
Remove $installer
Write-Output "Dotnet SDK = $version" >> ~/versions.txt
# default plus following components were selected:
# * Visual C++
# - Common Tools for Visual C++ 2015
# * Universal Windows App Development Tools
# - Tools (1.4.1) and Windows SDK (10.0.14393)
# - Windows 10 SDK (10.0.10586)
# - Windows 10 SDK (10.0.10240)
# * Common Tools
# -Visual Studio Extensibility Tools Update 3
# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
echo "Visual Studio = $version version $version_number" >> ~\versions.txt

View File

@@ -33,46 +33,50 @@
. "$PSScriptRoot\helpers.ps1"
# This script installs 7-Zip
# This script will installs msys2
$version = "20181211"
$version = "20200903"
$prog = "msys2"
if (Is64BitWinHost) {
$arch = "x86_64"
$sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
$folder = "msys64"
} else {
$arch = "i686"
$sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
$folder = "msys32"
}
$arch = "x86_64"
$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03"
$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
$folder = "msys64"
$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
$url_official = "http://repo.msys2.org/distrib/$arch/$package"
$PackagePath = "C:\Windows\Temp\$package"
$TargetLocation = "C:\Utils"
Download $url_official $url_cache $PackagePath
Verify-Checksum $PackagePath $sha1
Extract-tar_gz $PackagePath $TargetLocation
$msys = "$TargetLocation\$folder\msys2_shell.cmd"
if ((Test-Path $url_cache_prebuilt)) {
$PackagePath = "C:\Windows\Temp\$package_prebuilt"
Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath
Verify-Checksum $PackagePath $sha1_prebuilt
Extract-7Zip $PackagePath $TargetLocation
} else {
$PackagePath = "C:\Windows\Temp\$package"
Download $url_official $url_cache $PackagePath
Verify-Checksum $PackagePath $sha1
Extract-tar_gz $PackagePath $TargetLocation
$msys = "$TargetLocation\$folder\msys2_shell.cmd"
# install perl
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
Start-Sleep -s 30
cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
# install perl
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
Start-Sleep -s 60
cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
Start-Sleep -s 180
if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
Start-Sleep -s 360
if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
}
Write-Host "Cleaning $PackagePath.."
Remove-Item -Recurse -Force -Path "$PackagePath"
Write-Output "7-Zip = $version" >> ~\versions.txt
Write-Output "msys2 = $version" >> ~\versions.txt

View File

@@ -0,0 +1,50 @@
param(
[Int32]$archVer=32,
[string]$toolchain="vs2019",
[bool]$setDefault=$true
)
. "$PSScriptRoot\helpers.ps1"
$libclang_version="10.0"
Write-Output "libClang for QtForPython = $libclang_version" >> ~/versions.txt
# PySide versions following Qt6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 8.0 or higher is required for building.
# Starting from Qt 5.11 QDoc requires Clang to parse C++
$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-dynlibs-" + $toolchain
$libclang_version = $libclang_version -replace '["."]'
function install() {
param(
[string]$sha1=$1,
[string]$destination=$2
)
$zip = "c:\users\qt\downloads\libclang-dyn.7z"
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
$script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
Download $OfficialUrl $CachedUrl $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
}
if ( $toolchain -eq "vs2019" ) {
if ( $archVer -eq 64 ) {
$sha1 = "B2C4F24B2388AEBAA6B8FCE3AE4E63D34D1517FE"
}
else {
$sha1 = "b970f51df255a27e0fdb7b665e70ed5281257f40"
}
}
install $sha1 $baseDestination-$archVer
Set-EnvironmentVariable "LLVM_DYNAMIC_LIBS_100" ($baseDestination + "-_ARCH_")

View File

@@ -37,25 +37,25 @@
# Needed by QtWebengine
$version = "12.18.0"
$package = "C:\Windows\temp\nodejs-$version.zip"
$targetFolder = "C:\Utils\nodejs"
$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)"
$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip"
if ( $arch -eq 64 ) {
if (Is64BitWinHost) {
$arch = "x64"
$sha1 = "457b1527d249ee471a9445953a906cb10c75378d"
} else {
$arch = "x86"
$sha1 = "58801900f5bddca9c00feed6b84fed729426fc92"
}
$package = "C:\Windows\temp\nodejs-$version.zip"
$targetFolder = "C:\Utils"
$installFolder = "C:\Utils\node-v$version-win-$arch"
$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-$arch.zip"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-$arch.zip"
Write-Host "Installing Node.js"
Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
mkdir $targetFolder
Extract-7Zip $package $targetFolder
Add-Path $targetFolder
Add-Path $installFolder
Remove $package
Write-Output "Node.js = $version" >> ~/versions.txt

View File

@@ -40,7 +40,7 @@ $version = "6.6.1"
$qtBranch = "515x"
$targetDir = "C:\Utils\squish"
$squishPackage = "C:\Utils\rta_squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
# Squish license
@@ -62,7 +62,9 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) {
$sha1 = "17b5bec83f448877e42e5effdc7daf723d157800"
} else {
$sha1 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a"
$sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705"
#Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun"
}
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
$winVersion = "win7"
@@ -70,7 +72,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
}
$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils"
Copy-Item "$squishUrl\$squishArchive" "C:\Utils"
Verify-Checksum "C:\Utils\$squishArchive" $sha1
Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
Rename-Item "$squishPackage" "$targetDir"

View File

@@ -0,0 +1,71 @@
############################################################################
##
## Copyright (C) 2020 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 update MSVC 2019.
# NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
# MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release
$version = "16_7_5"
$urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe"
$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe"
$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00"
$urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe"
$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe"
$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e"
$installerPath = "C:\Windows\Temp\installer.exe"
function Install {
Param (
[string] $urlOfficial = $(BadParam("Official url path")),
[string] $urlCache = $(BadParam("Cached url path")),
[string] $sha1 = $(BadParam("SHA1 checksum of the file"))
)
Write-Host "Installing msvc 2019 $version"
Download $urlOfficial $urlCache $installerPath
Verify-Checksum $installerPath $sha1
Run-Executable "$installerPath" "update --passive --wait"
Remove-Item -Force -Path $installerPath
}
Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller
Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller
$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property catalog_productDisplayVersion 2`>`&1)
Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt
Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-v100-dyn.sh
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -80,7 +80,7 @@ installPackages+=(pulseaudio-libs-devel)
installPackages+=(libXtst-devel)
installPackages+=(nspr-devel)
installPackages+=(nss-devel)
installPackages+=(rh-nodejs12-nodejs)
installPackages+=(rh-nodejs12-nodejs) # NOTE! Nodejs12 needs to be added to PATH!
installPackages+=(rh-nodejs12-nodejs-devel)
# For Android builds
installPackages+=(java-1.8.0-openjdk-devel)
@@ -146,3 +146,8 @@ sudo /usr/local/bin/pip3 install wheel
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin:\$PATH"
gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-v100-dyn.sh
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -0,0 +1,8 @@
#!/usr/bin/env bash
set -ex
# Activate these modules
# This is needed by Nodejs and QtWebEngine
sudo SUSEConnect -p sle-module-web-scripting/15/x86_64

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -105,3 +105,13 @@ sudo zypper -nq install sqlite3 sqlite3-devel
# Java - needed by RTA jenkins
sudo zypper -nq install java
# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot.
sudo zypper -nq update open-vm-tools
# Nodejs - needed by QtWebEngine
sudo zypper -nq install nodejs10
sudo zypper -nq install nodejs10-devel
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -5,4 +5,4 @@ set -ex
# shellcheck source=../common/linux/gcc.sh
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
InstallGCC 9.3.0 50 526bc0ed135e65366080350d0f991157752223c0 b746688bf045a316fc92c3528138ad10d0822b6b
InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0

View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -36,7 +36,7 @@ sudo zypper -nq install libicu-devel libicu60_2
# qtwebengine
sudo zypper -nq install alsa-devel dbus-1-devel \
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel
mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel
# qtwebkit
sudo zypper -nq install libxml2-devel libxslt-devel
@@ -50,3 +50,5 @@ sudo zypper -nq install cups-devel
#speech-dispatcher
sudo zypper -nq install libspeechd-devel
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-v100-dyn.sh
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -ex
brew install --build-from-source node

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env bash
set -ex
brew install nodejs

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -0,0 +1,2 @@
# Allow SMB client guest logons to SMB server.
reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,8 +36,5 @@
# MSVC 2015 Update 3
Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt
# MSVC 2017
Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt
# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1"
# MSVC 2017 Build Tools
Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019
. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-dotnet.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1"

2
qt3d

Submodule qt3d updated: 34171b1d99...208f5835e6

2
qtbase

Submodule qtbase updated: 40143c189b...49adb85d34

2
qtdoc

Submodule qtdoc updated: 2d00e0060b...485e42bebe

2
qtqa

Submodule qtqa updated: db367270e4...36da1912a9

Submodule qtscxml updated: 95aa78be79...57491f554b

2
qtsvg

Submodule qtsvg updated: 52d3788c7b...119bb99715

Submodule qttools updated: cc52debd90...83b91bf9db