Compare commits

...

551 Commits

Author SHA1 Message Date
Liang Qi
e4cb75c5ae Update submodules on '5.14' in qt/qt5
Only qtwebengine this round.

Change-Id: Ib8ec9d5d290245917892cf2585e80a422dfc8daf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-07 20:59:36 +01:00
Heikki Halmet
f1276acf5c Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest version
Under coin/pre-provisioning can be found information what have been
provisioned to tier1 image

Visual studios are updated to versions:

MSVC 2019: version 16.3.1
MSVC 2017: version 15.9.16

Task-number: QTQAINFRA-2875
Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-07 21:59:25 +02:00
Liang Qi
68189ab965 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
2019-11-06 14:19:45 +01:00
Qt Submodule Update Bot
98cb5fa965 Update submodules on '5.14' in qt/qt5
Change-Id: I2d08d87f917232a79ebd9d7691610d61b82727b2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-06 13:35:27 +01:00
Tony Sarajärvi
b34681bf02 Remove macOS 10.12 from CI
Task-number: QTQAINFRA-3342
Change-Id: If617a762b4d65983d2d823ef035d4e5f9e5bc432
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-05 13:56:46 +00:00
Matti Paaso
f178318d2f Add new target for installer framework
Task-number: QTQAINFRA-3284
Change-Id: I3945160f212921b2b30cd39982a808cfc164a1b1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-11-04 14:46:22 +02:00
Qt Submodule Update Bot
d690f84fd4 Update submodules on '5.13' in qt/qt5
Change-Id: Ibe25a3e99d09aea840c9e86a403dc1577701eb0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-04 08:42:38 +01:00
Heikki Halmet
39a42f0abd Provisioning: Hide password with /dev/null
Change-Id: Ic60ba668764c928977c826e02686a0cd341b995f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:50 +03:00
Heikki Halmet
8bdabd9901 Provisioning: Remove Red Hat 6.6 from provisioning
Task-number: QTQAINFRA-3260
Change-Id: If6078a36e9ab7730cacb81a9c417c87455db89cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:41 +03:00
Heikki Halmet
52fe759eba Provisioning: Upgrade OpenSSL version to 1.1.1d
Plus removing unused file install_openssl_111a.sh

Task-number: QTQAINFRA-3224
Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:33 +03:00
Heikki Halmet
5b752460bc Provisioning: Update Xcode package for macOS 10.14
Apple's certification was expired so Xcode 10.2.1 package needs to be
updated from the Apple's download server. Old one causing problems with
RTA tests.

Task-number: QTQAINFRA-3317
Change-Id: I5006f95ab420e26523d2621800d80322a52bb9a2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 18:41:24 +02:00
Tony Sarajärvi
2eab420e80 Remove more of update notifiers
Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-01 08:14:27 +00:00
Tony Sarajärvi
5b77e74a5e Change local Ubuntu repo mirror in provisioning
The old mirror host Qt company used to sync their local mirror
from, stopped syncing from Ubuntu in October 2018.
The mirror mechanism was changed so that in the future if
addresses change, we don't have to touch the provisioning scripts
as the address is more general. Also a duplicate entry was removed.

Task-number: QTQAINFRA-3279
Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-01 08:14:27 +00:00
Liang Qi
3fb1ba5db8 Update submodules on '5.14' in qt/qt5
Change-Id: I6c26e0dadf6aafd228abb860a431f96629811e38
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-31 12:15:00 +01:00
Jani Heikkinen
464c4c8147 Drop unnecessary android builds
From 5.14 -> we will have combined android builds for all android
targets. So remove all separate android builds as those are covered by
multi ones.

Task-number: QTQAINFRA-3310
Change-Id: Ia00222cf56e85ed207ad01d5d00a81849196176d
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-10-29 19:46:26 +00:00
Heikki Halmet
eb0ef419ec Add allowUntrusted parameter for command line tools and refresh Xcode
Apple has signed their packages with certificate which has been
expired 24.11.2019. Packages are unusable without allowUntrusted
parameter

Also Xcode package for macOS10.13 needs to be refetched from
Apple's download to local cache

Task-number: QTQAINFRA-3317
Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-29 19:37:09 +02:00
Tony Sarajärvi
17550319e5 Provision gnuwin32's path
By provisioning the path to gnuwin32, we can remove the
hard coded paths from Coin.

Task-number: QTBUG-73422
Change-Id: Ice96fcd992e22ed39b66496403b9eaa99a6865a0
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-26 14:10:50 +00:00
Qt Submodule Update Bot
d5f83783f6 Update submodules on '5.14' in qt/qt5
Change-Id: Ieb58c167d34716afddfb3ecc83d1333b8dbc0bbb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-22 06:59:11 +02:00
Qt Submodule Update Bot
595a45dd1d Update submodules on '5.14' in qt/qt5
Change-Id: I666a0eefd0216eace1e1cfa302e48a5dec7cd4f5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-20 22:30:58 +02:00
Heikki Halmet
60befd7508 Provisioning: Disable automatic cleanup from windows
Task-number: QTQAINFRA-3238
Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-18 13:53:05 +03:00
Samuli Piippo
2b58935efd QNX: Use extprefix for the host path
Use extprefix instead of prefix, so that the target deployment
path won't contain host paths. Especially needed to avoid Windows
host paths on target. Prefix will default to /usr/local/Qt-x.x.x

Task-number: COIN-48
Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
2019-10-16 10:02:09 +03:00
Dimitrios Apostolou
72111504ea Update epel package to latest version
The online repo only contains the latest version.

Change-Id: I2dfbc3c2a873ed3758672682b09c0205bfa19549
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:05 +02:00
Dimitrios Apostolou
518e114dc7 Fix for DownloadURL to try alternative URL
Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:04 +02:00
Dimitrios Apostolou
482552d813 First try cached URL before hitting the official repo
Change-Id: Id0cf89090155459fd660d55ce427cd34bf3136f5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:02 +02:00
Dimitrios Apostolou
c6a9b3cd68 Update previously committed patch to match the branch's platforms
Task-number: QTQAINFRA-3092
Change-Id: I598759f0624e478a07cfe3256cbeba2f2b8bfe02
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-15 12:41:00 +02:00
Toni Saario
9ee61892d0 Add platform_configurations for StaticHostOnly targets
Configuring modules in specific files removes their dependency for
coin creating their configurations.

Task-number: COIN-259
Task-number: QTBUG-78942
Change-Id: I8f2a9a5672ca2261c8949baf49f2d0d093bf1c5b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-10-15 13:40:58 +03:00
Heikki Halmet
3f9673d109 Provisioning: Update Cmake to version 3.7.2
QtCreator requires Cmake minimal version to be at least 3.7.0

Task-number: QTQAINFRA-3272
Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-15 13:40:55 +03:00
Simon Hausmann
97f5eca381 Add separate debug info for MinGW packaging release builds
Since we stopped the separate debug builds for MinGW in 5.14, we should
include debug symbols for the release libraries as separate files to
give our users something.

Change-Id: Idf8a6748056cd9da03eddc37aebd77b4c190aedf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-10-10 21:39:29 +02:00
Heikki Halmet
d02f0a913e Provisioning: Hide windows squish installation output from the log
This will prevent the output of unwanted information

Change-Id: I5f1824a6bbe98c673ef04dc2daa0db0536d27828
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-09 11:50:32 +03:00
Heikki Halmet
e4ae752c0d Provisioning: Make sure that Configure and Make will pass
During powershell process error is not caught and provisioning
continues even if the exitcode is something else that '0'

Task-number: QTQAINFRA-3214
Change-Id: I91116a78d0c4defe6ba4287913c2394e199be958
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-09 11:50:32 +03:00
Qt Submodule Update Bot
bcdb9ba4dd Update submodules on '5.14' in qt/qt5
Change-Id: I30d07a8ee13b9cd8aa17bae8d4e4c7f9c6057401
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-09 06:51:12 +02:00
Dimitrios Apostolou
dd9a3883aa Ensure provisioning works even without the secrets
Change-Id: I3869e881341a719da8a351095c3bf314c2fa2f34
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-08 08:26:34 +02:00
Dimitrios Apostolou
869a9b3ae7 Fix shell function is_script_executed
It used to return error when tested inside a login shell, because $0 is
"-bash" and `basename` was trying to interpret -b as an option.

Change-Id: I5faa2dc01e50c7d5bcfc0ab1fcfd910b2538afc2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-08 08:26:34 +02:00
Dimitrios Apostolou
d97d1af1ee Fix provisioning script for RHEL 6
It seems RHEL 6.6 does not provide /etc/os-release.

Change-Id: I01ba2bb17b89c01f9991944a11eeaa9c2eba6f20
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-08 08:26:34 +02:00
Qt Submodule Update Bot
ab732c6ab7 Update submodules on '5.14' in qt/qt5
Change-Id: I945832ea3c2a88f427cb3c73e50f4592095e0ad6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-07 22:31:22 +02:00
Qt Submodule Update Bot
37b2f54919 Update submodules on '5.13' in qt/qt5
Change-Id: I1e4a3f0a9ec8280b5a6801096f283435c1f0f855
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-05 23:31:02 +02:00
Qt Submodule Update Bot
5d90df08c2 Update submodules on '5.14' in qt/qt5
Change-Id: I21c5bafb841524f3dbc0cef748d3a959d3866369
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-05 22:31:01 +02:00
Qt Submodule Update Bot
1735600d57 Update submodules on '5.14' in qt/qt5
Change-Id: I3e4f0c43898daceb419957702e31f1611de6c502
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-05 09:28:00 +02:00
Qt Submodule Update Bot
689eab5c35 Update submodules on '5.13' in qt/qt5
Change-Id: I47edb51a61cc8b9e7d7e4ec9ff1c9057e9d126fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-04 09:16:48 +02:00
Qt Submodule Update Bot
ace315a1f9 Update submodules on '5.14' in qt/qt5
Change-Id: Iebe9c33fa630b46cdedb994b8daf002f5d20b082
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-04 09:16:38 +02:00
Liang Qi
ec7bf6356c Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-10-03 06:12:24 +02:00
Qt Submodule Update Bot
7cd2473966 Update submodules on '5.14' in qt/qt5
Change-Id: I97f37b6418a58b0546b7a8b7b91229db5229a81e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 06:12:11 +02:00
Liang Qi
29befcc995 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml

Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
2019-10-01 11:37:07 +02:00
Dimitrios Apostolou
cfef857815 Reduce noise in the provision logs
Reduce verbosity in order to shorten logs and make them more readable.

In two cases we just remove the verbose flag.

In one other case we undo inlining of a huge script in the command line.
Because we run the provisioning scripts in trace mode, this caused the
script to be logged, and it was rather long and meaningless since it
comes from an external project.

Change-Id: I078ee3b3ab2db9425204375deb5815b6526a4466
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-01 06:11:48 +02:00
Qt Submodule Update Bot
f4e7c08e82 Update submodules on '5.13' in qt/qt5
Change-Id: I328c1cb350e067765b0f05e75179cf178dd2b14e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-01 06:11:41 +02:00
Qt Submodule Update Bot
b90dc27784 Update submodules on '5.14' in qt/qt5
Change-Id: I66ac39a88c5164d2feed7215029e621c122f90ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-01 06:10:51 +02:00
Qt Submodule Update Bot
317fbf9243 Update submodules on '5.13' in qt/qt5
Change-Id: I0738664f8f0129431b7e5c212fe1615b09792aec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-30 06:48:30 +02:00
Qt Submodule Update Bot
1a4d0a9534 Update submodules on '5.14' in qt/qt5
Change-Id: I1a1e2430d47476de5271b9278e84f53743bdbcee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-30 06:26:37 +02:00
Qt Submodule Update Bot
ec613d93e5 Update submodules on '5.13' in qt/qt5
Change-Id: I1e6126cbe20e293bc4ec88a492c0bf9ebfffd766
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-28 07:03:22 +02:00
Qt Submodule Update Bot
6cb7171397 Update submodules on '5.14' in qt/qt5
Change-Id: I5575a3cf1dd9cecf5162b077e64b28eec15bcffd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-28 07:03:09 +02:00
Qt Submodule Update Bot
33e0c2b54f Update submodules on '5.14' in qt/qt5
Change-Id: I79b9eeb90afc56baae339b6598dd01840d6918ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-27 09:20:43 +02:00
Dimitrios Apostolou
842b72e080 Move telegraf install to start of provisioning macos
Change-Id: Ied2b7a415abe5e101b6bfb60472b74070debe9e9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:43:06 +02:00
Dimitrios Apostolou
c4e14a59ec Move telegraf install to start of provisioning linux
Change-Id: Ia42b0c21f6e341a941e98d3abbda512cfb0fda92
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:43:00 +02:00
Dimitrios Apostolou
de56775c32 Move telegraf install to start of provisioning windows
Change-Id: Icf4f213be5a33ec2ad89d514b9bba5d4a3587117
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:54 +02:00
Dimitrios Apostolou
4e3a0f79fb DownloadURL now works with either wget or curl
The reason is that Ubuntu does not have curl at the very beginning of
provisioning scripts, and also does not have the repositories configured
in order to install it.

Change-Id: Ia485c1672f894bc800f199b742d238b2945938e5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:49 +02:00
Dimitrios Apostolou
8f4c12bc03 Install 7-zip at the beginning of provisioning Windows
so that we can extract zip files early and install telegraf.

Also moved disabling Windows defender, to keep it at
the very beginning of provisioning.

Change-Id: I6c2039ebd20e541bdd7d437dd56ccb06a1619a5f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:43 +02:00
Dimitrios Apostolou
89f6db8c22 Adjust pre-existing script to use the new common.sourced.sh
Change-Id: Icf7829d3499110a76b90679ba2d067f80d189e69
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:37 +02:00
Dimitrios Apostolou
fbe3a8d84e Install telegraf on all provisioned VMs
Install binaries as early as possible in the provisioning process, and
start them, in order to monitor provisioning too.

To achieve this, some OS auto-detection logic is introduced in shell
script common.sourced.sh. The script can be sourced and used in all kind
of other generic scripts.

ioping is also installed from custom-compiled binaries in order to
monitor the disk latency of the VMs. Reason we don't use ioping from the
repositories, is that the units differ between ioping versions (new
ioping reports latencies in nanoseconds, old in microseconds).

Fixes: QTQAINFRA-3092
Change-Id: I9d9afb791955725d4bd0b32dae97dfc0bd4a76a3
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:31 +02:00
Liang Qi
0a0ec7ffe3 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-09-27 07:50:25 +02:00
Liang Qi
076fb6bd6d Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
	coin/platform_configs/qt5.yaml

Change-Id: Iaeec542042807c00e4c2597b546b00ce0f267b48
2019-09-27 07:27:28 +02:00
Dimitrios Apostolou
c0fce7a3b3 Refactor DownloadURL.sh
Auto-detects and verifies all kinds of hashes, not only SHA1.
Hash verification is now an autonomous function.
If the file is found at the destination, skip redownloading it if the
hash is OK.
Runs on POSIX sh, not requiring bash.
Retain compatibility with previous version.

Change-Id: I9930336030aa776f49dc460fe766f3e831700255
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:31 +02:00
Dimitrios Apostolou
c7f87acb37 Do not silence standard error
Provisioning was failing and the logs did not provide any useful
information because of the silenced squish install command. So I went
through all the scripts and I re-enabled stderr logging where I found it
silenced (with the exception of where it was purposeful or harmless).

Change-Id: I5fa0b0ba4362970b214c150d399b6720b1780e1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:25 +02:00
Dimitrios Apostolou
b8eb110c81 Increase open files and processes limit on macOS
Change-Id: If93bbe067f76168a7c131c6ced187f00a8d908e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:20 +02:00
Dimitrios Apostolou
b97df21bef Brew update only once
Change-Id: I6c2650574b6b62ceedfc95a9caab7ca26a6fa10b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:15 +02:00
Dimitrios Apostolou
bdc5dae67b Speed up provisioning on Linux
Change-Id: I6e4e5621ed0b063215476ef51d61ef1f38198d0c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:11 +02:00
Dimitrios Apostolou
acfc7ad18d Fix message "RPMDB altered outside of yum"
yum install supports a local filename on RHEL 6 or newer.

Change-Id: I873ab3dfab56003ded45bc6c4099aae150f423dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:06 +02:00
Dimitrios Apostolou
c87a6e9c6d Fix delays caused by PackageKit locking RPMDB
It seems that disabling it is not enough, it has to be fully removed.
It is also removed later in the scripts but it wasn't enough apparently,
so no harm done removing it twice.

Change-Id: If1a4f032240e66100b68bca3196a700cb570701e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:02 +02:00
Dimitrios Apostolou
e6fccbf240 Remove the progress bar from the sdkmanager output
Cleans up many thousands of useless lines from the logs.

Change-Id: I2673f65b713996637d2161da4db726823e17c0df
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:11:56 +02:00
Qt Submodule Update Bot
cb8e769cf6 Update submodules on '5.13' in qt/qt5
Change-Id: I2c212ec01df2fa67cad4d9e84988d0b31678e6fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-26 07:13:56 +02:00
Qt Submodule Update Bot
d1a81a8e1c Update submodules on '5.14' in qt/qt5
Change-Id: I15e5942e323d9315fc92d3a907106367f7710d09
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-26 06:13:53 +02:00
Qt Submodule Update Bot
ad2113fd23 Update submodules on '5.14' in qt/qt5
Change-Id: Ia3abeacaa4604fecfa0024e1db901d08510d60c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-25 09:23:23 +02:00
Qt Submodule Update Bot
41ef5a706d Update submodules on '5.13' in qt/qt5
Change-Id: I239abc4de7cec9c5366d177933a4b16c85067971
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-24 23:31:06 +02:00
Jani Heikkinen
2cec2c5f8c Add build for combined android targets
From 5.14 -> android builds are done by default at one go. Add new builds
for doing that.

Removing old, separate builds will be removed in a follow-up patch to
give time for packaging to adapt that new system

Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-09-24 12:08:17 +03:00
Qt Submodule Update Bot
f60588ee72 Update submodules on '5.14' in qt/qt5
Change-Id: I2a4d65f7cd94f3a6ce7036f20b8a545a160434d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-24 10:57:29 +02:00
Qt Submodule Update Bot
1760acb17d Update submodules on '5.13' in qt/qt5
Change-Id: I5405348497e527dc5b4b1ff411736ffebeedb246
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-24 10:06:00 +02:00
Liang Qi
3b335077f7 Update submodules on '5.14' in qt/qt5
Change-Id: Ic0e53050e8a7c0928e0ca9ee17f30a303957ea84
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-23 12:31:09 +02:00
Qt Submodule Update Bot
a4ca20dfce Update submodules on '5.13' in qt/qt5
Change-Id: I75182fb8b231e3086a77c1778320cf0f2590cf92
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-22 12:58:05 +02:00
Qt Submodule Update Bot
5d3b2413d0 Update submodules on '5.13' in qt/qt5
Change-Id: Id1259c1907605ad33cbe7f3be3041b26c01f3387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-20 09:32:54 +02:00
Qt Submodule Update Bot
de26b29c33 Update submodules on '5.13' in qt/qt5
Change-Id: I42016698eb34b06de2ef9ee268b4b59e9af38f54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-18 07:34:15 +02:00
Assam Boudjelthia
ddc99482eb Cherry-pick a QEMU fix for "core dumped" during tests
Task-number: QTBUG-63152
Change-Id: Iac803ca67537eeb9085fb87625103fdde0bfd904
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-17 11:57:28 +03:00
Heikki Halmet
0cf3fdabe3 Provisioning: Upgrade Python pip version for Windows machines
Task-number: QTQAINFRA-2564
Change-Id: I10402bb3169b483c71e44db7ecba443eb4f46dc1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-17 08:57:18 +00:00
Heikki Halmet
a3136bdbfe Provisioning: Disable or delete unneeded tasks and services
Windows have lot's of tasks and services running which are slowing
the performance of build machine. Also 'windows' and 'windows
defender' updates need's to be "permanently" disabled.

Task-number: QTQAINFRA-3182
Change-Id: I8f6b237fcdc6e38fa9a06836d349821d86c58afc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-17 11:57:11 +03:00
Liang Qi
e62df66bac Update submodules on '5.14' in qt/qt5
Change-Id: Ic4dacbe6f7f964d10b1cd5569ddf933c0f638126
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-17 08:02:58 +02:00
Liang Qi
c22758cc1e Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-09-17 08:02:50 +02:00
Liang Qi
01ad208333 Merge remote-tracking branch 'origin/5.13' into 5.14
This change partially reverts 24f0367a60.

 Conflicts:
	coin/platform_configs/default.yaml
		SLES 12 got removed temporarily.

Task-number: QTQAINFRA-2851
Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
2019-09-13 13:04:25 +02:00
Qt Submodule Update Bot
b83b16277d Update submodules on '5.13' in qt/qt5
Change-Id: Icc4380912fc6d1cbb35b2282c37a180641186f60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-13 10:55:14 +02:00
Heikki Halmet
fa03dbce1f Platform configurations: Move Android_ANY (clang-x86) to default
Arm targets from default change places with clang-x86 from qt5

Task-number: QTQAINFRA-3153
Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-12 20:51:28 +03:00
Qt Submodule Update Bot
6762ccb186 Update submodules on '5.14' in qt5
Change-Id: Ib6d7eb8b580702724369ac7c81df16688b2b87ec
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-12 11:40:43 +02:00
Qt Submodule Update Bot
39a9e58888 Update submodules on '5.13' in qt5
Change-Id: I07251a5915fb85153fb81d05dc16c7ed8eba5dcf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-12 06:16:17 +02:00
Qt Submodule Update Bot
bcdfcd2668 Update submodules on '5.13' in qt5
Change-Id: Id18e857d3312854344f5ffa01cf7666107803a0b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-11 09:03:16 +02:00
Qt Submodule Update Bot
7e78bd1efd Update submodules on '5.14' in qt5
Change-Id: Ifa16f5ec4558b490dd775598b269ef6699cceb91
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 21:49:51 +02:00
Assam Boudjelthia
d8a384f03f Provisioning: Use correct sysroot path for QEMU armv7 in qtdeclarative
Task-number: QTQAINFRA-2808
Change-Id: Ia0caf7003a5bd67dc220f0a3a1da06646ca6b657
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-10 10:49:01 +03:00
Qt Submodule Update Bot
4909f4a765 Update submodules on '5.13' in qt5
Change-Id: I201b65701b7f9f58422ba1bcdbd42c6278d9e604
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 09:48:47 +02:00
Liang Qi
66ea34668a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-09-10 09:48:42 +02:00
Liang Qi
8c00a4f011 Add webAssembly build for windows again
This reverts commit 9a8fb868ec
partially.

See also 38e416be66.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 06:13:18 +02:00
Liang Qi
bbc7794b64 Update submodules on '5.14' in qt5
Change-Id: I98f238f0dbe8cb3537808457b448c7e61ac533a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 06:13:09 +02:00
Liang Qi
1bb7d2d0c9 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iffcf9b199df17a50acf03e29b9deae033396dfcb
2019-09-09 20:57:09 +02:00
Tuomas Heimonen
d4e3d3cac3 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-opengl' to remove xcb from static build
Add build flag '-no-vulkan' to disable vulkan

Task-number: QSR-517
Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-09 16:53:05 +03:00
Qt Submodule Update Bot
6402cb61b8 Update submodules on '5.12' in qt5
Change-Id: Ia09d245958bf1e24ba9f95e033dc3803d14edab4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-09 08:45:11 +02:00
Heikki Halmet
ad93109d92 Provisioning: Add emsdk to macOS 10.14
Task-number: QTQAINFRA-3191
Change-Id: I46a72db63966804b33996d8bc3babe50cd2a41dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-09 08:35:24 +03:00
Qt Submodule Update Bot
0c0ed734ef Update submodules on '5.13' in qt5
Change-Id: I23ec6312d3bb028effe1f60d2266c5bb212050f5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-08 11:11:40 +02:00
Liang Qi
aceecad75d Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12" 2019-09-07 18:34:12 +02:00
Liang Qi
e56e0f699d Merge remote-tracking branch 'origin/5.12.5' into 5.12
Change-Id: I693eeef79b21804e2a0871bdd759271f8a97fcb4
2019-09-07 18:33:02 +02:00
Qt Submodule Update Bot
1d956e93d0 Update submodules on '5.12' in qt5
Change-Id: I7059a96dccad04c8647443c8b8e13c2ca88fc5b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 13:06:51 +02:00
Qt Submodule Update Bot
15b4e146e5 Update submodules on '5.13' in qt5
Change-Id: Ic653e56614712c8e7dcd5095b8d32f08dea61731
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 09:09:30 +02:00
Assam Boudjelthia
d581d86fc5 Provisioning: update QEMU toolchains
* Update QEMU toolchains to Yocto thud(2.6) release(DC Qt 5.13.0) with
GCC 8.2.0.
* Suppress QEMU "Unsupported syscall" and "Unsupported ioctl" logs,
set environment variable QEMU_SYSCALL_DEBUG to show them.

Task-number: QTQAINFRA-2808
Change-Id: I987353b0f3aff87a02ea3bf96ace8de32d6f557b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-07 07:09:24 +00:00
Liang Qi
f0a89a32da Update submodules on '5.14' in qt5
Change-Id: Ice4211fcc08fa25a55d6a5be1b236b3bdc12c9e1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-06 11:06:00 +02:00
Assam Boudjelthia
0d273deeef Provisioning: Fix version of libiodbc on MacOs
libiodbc latest version (3.52.13) was automatically installed causing
qt-config-gui to fail build, this installs version 3.52.12.

Task-number: QTQAINFRA-3188
Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-06 06:05:40 +00:00
Tuomas Heimonen
be97b9ad72 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-xcb' to remove xcb from static build

Task-number: QSR-517
Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-06 07:11:51 +03:00
Tor Arne Vestbø
14c31bf8db Remove un-needed configure arguments for Apple OSes
Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-09-05 23:40:29 +02:00
Qt Submodule Update Bot
1c5e02896c Update submodules on '5.12.5' in qt5
Change-Id: Ife588e41d563bf4246ed7eff14186aa7583b3397
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-09-04 19:29:15 +00:00
Heikki Halmet
30e7bf5745 Provisioning: Add Android NDK ROOT to environment variable
Task-number: QTQAINFRA-3181
Task-number: QTBUG-74952
Change-Id: I4cc6936c3b3eef32a1013888ced3950cd1f39407
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-09-04 12:27:26 +03:00
Heikki Halmet
7fd2796b00 Provisioning: Update Android NDK version to macOS 10.14
Currently we are provisioning older Android NDK version than the one
used in macOS 10.13. Let's keep these sync even though we don't currently
make Android builds with macOS 10.14

Change-Id: I6c284d50bac395eb474c0f7e34cd90eda3f180c3
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-09-04 12:27:09 +03:00
Liang Qi
700540f77a Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.14" 2019-09-04 09:42:18 +02:00
Liang Qi
f9801f90f6 Merge remote-tracking branch 'origin/5.13.1' into 5.14
Conflicts:
	coin/platform_configs/qt5.yaml
		5.14 is using NDK r20 for android.

Change-Id: I483a628abd154c40937a44e196643a2be2552987
Fixes: QTBUG-77999
2019-09-04 09:41:19 +02:00
Qt Submodule Update Bot
f3c4f6edeb Update submodules on '5.13' in qt5
Change-Id: I653ae34a4544c7a9beb59cced2ce91d6512c67a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-04 06:56:17 +02:00
Qt Submodule Update Bot
c398a50e2d Update submodules on '5.12' in qt5
Change-Id: I3467f8edbbd5c52f53ed786c2c0f185e8558c1f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-04 06:56:00 +02:00
Tuomas Heimonen
5035d38525 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-qpa offscreen' to remove dependency to xcb libraries

Task-number: QSR-510
Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-03 21:37:50 +03:00
Qt Submodule Update Bot
885e662082 Update submodules on '5.13' in qt5
Change-Id: I30e7dbbbc47d26fcd8d7f802b7f46b635c14a858
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-03 18:07:22 +02:00
Qt Submodule Update Bot
ae3f765798 Update submodules on '5.12.5' in qt5
Change-Id: I22bbce6e60cc835a5dc9f88737e04ecc7a1fc3e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-03 06:44:29 +02:00
Jukka Jokiniva
80791b03ee Update qtbase submodule on 5.13.1 in qt5
Change-Id: Ia5d9429b6cfc0804355a2161a18f030db6fa6dae
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-02 19:48:24 +03:00
Qt Submodule Update Bot
4c65509d24 Update submodules on '5.12' in qt5
Change-Id: I1c5b9f51ed5a4dcb4469aa90439da993bc133319
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-30 22:02:37 +02:00
Qt Submodule Update Bot
27bbc46848 Update submodules on '5.13' in qt5
Change-Id: I5c1cc1e7edced0c2b62643b40769d84ebdeb3611
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-30 14:17:51 +02:00
Tuomas Heimonen
5752c0d4bc Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-icu' to remove dependency to icu libraries

Task-number: QSR-499
Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-08-30 13:34:06 +03:00
Qt Submodule Update Bot
314d3efaf0 Update submodules on '5.14' in qt5
Change-Id: I0f5fdbd9f369dc42dd4c97dad1cb933753220e58
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-29 18:20:58 +02:00
Liang Qi
136639b445 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-29 07:06:54 +02:00
Liang Qi
f58935ebea Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/platform_configs/default.yaml
	coin/provisioning/common/linux/disable-ntp_linux.sh
	coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
	coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
		emsdk.sh was moved from linux to unix, see
		38e416be66

Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
2019-08-28 20:28:11 +02:00
Qt Submodule Update Bot
097b013183 Update submodules on '5.13' in qt5
Change-Id: Ibdf69fb6840da0ddcbe5e8623c19d0ce1c34f844
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-28 19:37:29 +02:00
Tuomas Heimonen
163bd8006e Update Saferenderer static builds
qtci-windows-10-x86_64-10 static build: remove flag '-developer-build'
qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig'
and '-qt-freetype', remove flag '-developer-build'

Task-number: QSR-491
Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-08-28 09:53:18 +00:00
Qt Submodule Update Bot
90d59cb4c7 Update submodules on '5.12' in qt5
Change-Id: I7f044a3d3a1aed8d1f9b97a1e73871ea91e9719e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-27 09:02:26 +02:00
Liang Qi
e6e51c07f5 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-27 00:39:02 +02:00
Tuomas Heimonen
11d6401d98 Update Saferenderer static builds
DisableTests on qtci-windows-10-x86_64-10
Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64

Task-number: QSR-432
Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-08-26 20:47:05 +03:00
Liang Qi
6f3f8913d8 Merge remote-tracking branch 'origin/dev' into 5.14
Conflicts:
	.gitmodules

Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
2019-08-26 18:31:59 +02:00
Christian Strømme
ff75bd5297 Add QtQuick3D as a submodule in qt5.git
Adds QtQuick3D as a preview module in dev

Task-number: QTBUG-77724
Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2019-08-26 12:43:06 +03:00
Qt Submodule Update Bot
54e8d38972 Update submodules on '5.12.5' in qt5
Change-Id: If4b169a8c53ffb6857cc43d6e1dd5f7d639db45f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-26 07:47:12 +02:00
Qt Submodule Update Bot
98d9e2ebaa Update submodules on '5.12' in qt5
Change-Id: I0fafe70aa1dcb74cd6e06eb37dca1175a50c568e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-24 08:32:33 +02:00
Qt Submodule Update Bot
5f8a9b15de Update submodules on 'dev' in qt5
Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-23 06:55:03 +02:00
Tony Sarajärvi
0414df3e2e Build MIPS64 with b2qt toolchain - again
This configuration verifies big endian builds.

The build was accidentally removed in merge
a94696ccd5.

See also 9b84c7135b.

Task-number: QTQAINFRA-2492
Change-Id: I2616f918591758b4cfee244a0a5414a61322f7d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-08-22 11:30:56 +00:00
Liang Qi
c9a0797a11 Update qtdatavis3d only
Change-Id: Ic100c7bac6fd7155203e2c16a2f855423b52cc5e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-22 13:30:49 +02:00
Qt Submodule Update Bot
9b0ff12595 Update submodules on '5.13' in qt5
Change-Id: I3c4c289580c3a5200989e76502c43a9ef293afed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-22 09:02:00 +02:00
BogDan Vatra
9dd4451234 Android: Update Android NDK to version r20
Fixes: QTQAINFRA-3152
Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-08-22 06:55:47 +02:00
Qt Submodule Update Bot
54be78024d Update submodules on '5.12' in qt5
Change-Id: I82c4484938c958901bbc961b76a4012e0e925b9c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-22 04:42:50 +02:00
Assam Boudjelthia
8a5d86d888 Suppress QEMU syscall and ioctl debug messages
Compile QEMU with "Unsupported syscall" and "Unsupported ioctl" messages
suppressed, those can be shown by set/unset environment variable QEMU_SYSCALL_DEBUG.

Task-number: QTQAINFRA-2808
Change-Id: If0b28c47f2599c4ebca9cae6a6d38f9a4fd00458
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-21 12:00:57 +03:00
Liang Qi
3631a12b84 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-21 08:31:18 +02:00
Liang Qi
04f8b0619d Merge remote-tracking branch 'origin/dev' into 5.14
Change-Id: Iaccaf809372bc6132af4e25af2ca8b163b810e0a
2019-08-21 08:26:49 +02:00
Qt Submodule Update Bot
e27c7adda7 Update submodules on '5.13.1' in qt5
Change-Id: I6a801fd43a71d5ba772e71dae4101a6edbbcac95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-21 04:09:06 +00:00
Liang Qi
eb7370a7af Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-08-21 05:56:56 +02:00
Liang Qi
9a8fb868ec Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26.

 Conflicts:
        coin/platform_configs/default.yaml
                Temporarily remove the -no-opengl build.
        coin/platform_configs/meta-boot2qt.yaml
        coin/platform_configs/qt5.yaml
                Temporarily remove the webassembly build on windows.
        coin/platform_configs/qtwebkit.yaml

Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
2019-08-20 14:10:00 +02:00
Qt Submodule Update Bot
6e601907b9 Update submodules on '5.12' in qt5
Change-Id: Icd7419b3717c164db5f978610a2e821b683d8b22
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-20 07:09:40 +02:00
Qt Submodule Update Bot
acafe0ad49 Update submodules on '5.13.1' in qt5
Change-Id: I0f321007da9f236c069703125d5529a54ad27c9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-19 14:04:16 +00:00
Paul Wicking
2e9314967c Adjust submodule branches 2019-08-19 15:11:54 +02:00
Heikki Halmet
61acd9e95d Provisioning: Update iOS signing tools
new apple id is required with notarization

Task-number: QTBUG-77359
Change-Id: I2aafda37d40608296d598b1d9ade83a025bcac8d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-08-19 13:31:38 +03:00
Paul Wicking
7c691c4622 Adjust submodule branches 2019-08-19 09:43:00 +02:00
Qt Submodule Update Bot
b959cb5359 Update submodules on '5.13.1' in qt5
Change-Id: I4f319b0afe7e7369eb7db168f66ec57ed867c267
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-18 23:00:57 +02:00
Qt Submodule Update Bot
9656531361 Update submodules on '5.12' in qt5
Change-Id: I8de6a77d460db6497b76dac92be674fe9e790b7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-18 11:21:34 +02:00
Qt Submodule Update Bot
b03790e34d Update submodules on '5.13.1' in qt5
Change-Id: I6c95fa658c52571ce1e0588eac1b9763f0bae549
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-16 23:01:16 +02:00
Tuomas Heimonen
9d69ef09e3 Add Packaging to Saferenderer static builds
Task-number: QSR-432
Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-08-15 09:05:43 +03:00
Qt Submodule Update Bot
53c6c8a1ba Update submodules on '5.12' in qt5
Change-Id: Id2425a28299ca3653bc7d217855c276493bbccfe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-15 05:40:13 +02:00
Qt Submodule Update Bot
3277628d62 Update submodules on '5.13.1' in qt5
Change-Id: Ic89472db863aedd92db57dbaaf2dd5fd10efa96f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-15 05:39:39 +02:00
Liang Qi
63181db03e Enable a no-gui build on Ubuntu 18.04 for 5.13
Task-number: QTQAINFRA-2576
Change-Id: I4bc96802b5fe940408158734b01f7b9b01361235
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-14 22:57:35 +02:00
Qt Submodule Update Bot
42366fd740 Update submodules on '5.13' in qt5
Change-Id: I082dbfe9cd927aa112760db67e4657868289c4e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-14 22:25:00 +02:00
Qt Submodule Update Bot
8d90ddd531 Update submodules on '5.13.1' in qt5
Change-Id: I2324f8a205f5e7fcb4cfea9e7e845ef9f4f867e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-14 16:20:11 +02:00
Liang Qi
2fd2a9d268 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-14 07:02:19 +02:00
Tony Sarajärvi
8e32f46764 Add Suse Linux Enteprise Server 15 to the CI
Task-number: QTQAINFRA-3123
Change-Id: I725c58c7d319945f7470118dec99b5360385da7b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-14 03:45:39 +00:00
Jani Heikkinen
4175af18f8 Add Android x86_64 architecture
It seems those build targets were accidentally deleted when
yaml change was merged in. Targets were there in Qt 5.13.0 release
(before yaml change)

This amends a94696ccd5.

See also ebcfcbe69a.

Task-number: QTBUG-47672
Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-08-13 22:11:31 +00:00
Tony Sarajärvi
24f0367a60 Add Suse Linux Enteprise Server 12 to the CI
Task-number: QTQAINFRA-2851
Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-13 11:03:52 +00:00
Liang Qi
82e0fe1664 Merge remote-tracking branch 'origin/5.13.1' into 5.13
Change-Id: Ifc39acfc1a0ba6019091a194088e99e451f99bde
2019-08-13 10:49:03 +02:00
Qt Submodule Update Bot
b96719cb80 Update submodules on '5.12' in qt5
Change-Id: I465bd3b417d3412d7d8d62d868aa8ccb338127f2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-13 07:45:27 +02:00
Qt Submodule Update Bot
c63dd0ddfd Update submodules on 'dev' in qt5
Change-Id: I912e43550293e17b22e1401d50e7a4a06ee4c3b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-12 23:02:33 +02:00
Simo Fält
d19f60d745 Provisioning: Append the emscripten to path instead of prepend
Having it first in path seems to cause some confusion when detecting
libc++ in darwin.

Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-12 21:01:55 +00:00
Qt Submodule Update Bot
19cc6b2b80 Update submodules on '5.13.1' in qt5
Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-12 21:25:08 +02:00
Qt Submodule Update Bot
edf6149a5b Update submodules on '5.13' in qt5
Change-Id: Id153f5c742637fe66bb9010fa41cb62645fb4e4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-11 12:04:31 +02:00
Joni Jäntti
3b0fbe7213 Provisioning: Ubuntu 18.04: Add required packages for b2qt
These packages are required for building b2qt module.

Needed also on 5.12 branch as meta-qt5 follows Qt branching
and will take provisionings from here.

Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit ee9dd0d860)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-11 09:37:41 +03:00
Qt Submodule Update Bot
fbec569aea Update submodules on '5.12' in qt5
Change-Id: I363647bd417426f6f3629f42bbd1f6e83570c47e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-09 15:37:35 +00:00
Qt Submodule Update Bot
8ede8851f4 Update submodules on '5.13' in qt5
Change-Id: If3fe6bab310eb0e403c040ea465ac8197a7059a2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-09 16:22:39 +02:00
Liang Qi
1f79ae5d86 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-09 16:22:09 +02:00
Qt Submodule Update Bot
4230f4ac54 Update submodules on 'dev' in qt5
Change-Id: Ic8e437d68ed59391f9a0c5c73cc57298a109b02f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-09 13:00:53 +02:00
Liang Qi
49c808befb Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
	.gitmodules

Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
2019-08-09 09:02:41 +02:00
Qt Submodule Update Bot
9e370453bb Update submodules on '5.13' in qt5
Change-Id: Ibcdd2991705555bda542b60c25dbdb0e3dd572cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 23:13:30 +02:00
Liang Qi
f32c9f755e Include QtWebEngine again
This reverts commit a94696ccd5 partially.

Task-number: QTBUG-77304
Task-number: QTBUG-77305
Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-08 22:51:04 +02:00
Qt Submodule Update Bot
0f89c02328 Update submodules on '5.13.1' in qt5
Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-08 22:50:57 +02:00
Liang Qi
9b186a9d36 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13.1" 2019-08-08 22:50:52 +02:00
Liang Qi
03d4a54e34 Merge remote-tracking branch 'origin/5.12' into 5.13.1
Conflicts:
	.gitmodules
	coin/platform_configs/qtbase.yaml

Change-Id: I964ffb430436c62ad675fabc853642800499ade3
2019-08-08 15:31:47 +02:00
Jani Heikkinen
9929aff99e Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop build
After adding "-force-debug-info" and "-separate-debug-info" debug information
is going in the binaries accidentally & so on exploding binary size.

Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as
configure argument will prevent debug information not to go inside binaries.

Task-number: QTBUG-69767
Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-08 16:21:20 +03:00
Liang Qi
42bfac5bf8 Include qtvirtualkeyboard again
This partially reverts commit 452e0d94d4.

Task-number: QTBUG-76371
Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-08-08 14:19:46 +02:00
Tony Sarajärvi
b88acae7a8 Partially revert 'Do DeveloperBuild for Boot2Qt'
This partially reverts commit 8f073cea69.

Autotests slow down way too much still, so we can't run developers
builds eveywhere.

Task-number: QTBUG-63152
Task-number: QTBUG-77304
Task-number: COIN-326
Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-08 12:19:38 +00:00
Qt Submodule Update Bot
f08bd26eeb Update submodules on '5.12' in qt5
Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 11:45:10 +02:00
Qt Submodule Update Bot
b326a502db Update submodules on '5.13' in qt5
Change-Id: If03f5533dcfb83ac2002f109118b5bfa8a4bad5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 00:45:02 +02:00
Qt Submodule Update Bot
f511a2d74f Update submodules on '5.13.1' in qt5
Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-07 12:14:24 +02:00
Qt Submodule Update Bot
2b738468de Update submodules on '5.13.1' in qt5
Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-07 10:35:33 +02:00
Liang Qi
f8439ea42c Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1" 2019-08-07 10:35:16 +02:00
Liang Qi
13b206662b Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.

 Conflicts:
	.gitmodules

Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
2019-08-06 11:46:15 +02:00
Qt Submodule Update Bot
b41a217f35 Update submodules on 'dev' in qt5
Change-Id: Ic29d83fa0488cc77726adde23f21c68f0d7fecc3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-06 06:15:27 +02:00
Qt Submodule Update Bot
2fb0e4f352 Update submodules on '5.13' in qt5
Change-Id: I9498fe9045d23ec400d9437f375d547f054909b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-06 06:12:03 +02:00
Qt Submodule Update Bot
2970d3660c Update submodules on '5.13' in qt5
Change-Id: If5c6d3363438d613e5ea96bc84018ef913067296
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-05 11:28:51 +02:00
Liang Qi
1e476b01fd Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-05 11:28:39 +02:00
Qt Submodule Update Bot
cb14d29efe Update submodules on 'dev' in qt5
Change-Id: I72ceb9f1c47f5786a8a061b744e085aadb5e17a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-04 23:01:00 +02:00
Liang Qi
58977376e1 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
2019-08-04 11:51:40 +02:00
Tony Sarajärvi
9da27c5808 Add macOS 10.14 to the CI
Task-number: QTQAINFRA-2938
Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-03 23:01:34 +03:00
Liang Qi
689ed30f2a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-03 00:08:09 +02:00
Liang Qi
a94696ccd5 Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	.gitmodules
		ignore QtWebEngine on QEMU temporarily.
	coin/platform_configs/default.yaml
		no-gui build was removed temporarily.
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/qtsaferenderer.yaml

Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
2019-08-03 00:02:43 +02:00
Samuli Piippo
fde090e4b5 Add targets for yocto builds
Add empty linux targets that are used by the yaml file from
meta-boot2qt and meta-qt5

Fixes: COIN-320
Change-Id: I574185345a3c3dec0a033e7faed45091b89d4959
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-08-02 09:19:13 +00:00
Qt Submodule Update Bot
4c609c4db3 Update submodules on 'dev' in qt5
Change-Id: I83e4cfe7c9598e4454b2007c993413d85f7a3785
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-02 09:12:07 +02:00
Qt Submodule Update Bot
4c5d3f2e43 Update submodules on '5.13' in qt5
Change-Id: Ia8f240a565043822fec60ce29b348bb79846919e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-01 22:31:04 +02:00
Qt Submodule Update Bot
1fbba6d1ce Update submodules on 'dev' in qt5
Change-Id: Ifa9d7423aeb8bbc179dd31b38c5b1368c8f54146
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-01 14:52:08 +02:00
Konstantin Tokarev
125c5e6528 Provisioning: update conan_manifests for libxslt packages
Package recipe was improved, as a result packages were rebuilt and
checksums need update.

Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-01 14:24:56 +03:00
Konstantin Tokarev
b521ad483c Update platform_configs for QtWebKit
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-01 14:24:48 +03:00
Jani Heikkinen
30b0d05343 Remove 'Packaging' feature from WinRT_10 x86
We don't deliver binaries for that target anymore -> do not export that
either

Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-08-01 12:31:28 +03:00
Qt Submodule Update Bot
72f1742097 Update submodules on '5.13' in qt5
Change-Id: I6f218e6cc6c7de9a4f87f63814e01079a7ab1b02
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-01 10:48:34 +02:00
Qt Submodule Update Bot
d3fbd2ed1a Update submodules on '5.12' in qt5
Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-31 23:31:05 +02:00
Liang Qi
488415a9c5 Update submodules on 'dev' in qt5
Change-Id: I2927de7c1c756d0c2645308e8cdfecce01533bc0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-31 10:14:05 +02:00
Juha Karjalainen
38e416be66 Add webAssembly build for windows and macos
Provision emsdk and its dependecies to windows and macos.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-with: Juha Karjalainen <juha.karjalainen@qt.io>
Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-07-31 09:44:53 +03:00
Qt Submodule Update Bot
e6823acbc7 Update submodules on '5.13' in qt5
Change-Id: I78f3250367bf544dd8a5b5f1a0cd91c20655e065
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-30 20:08:39 +02:00
Frederik Gladhorn
a268fb4689 Adjust submodule branches
Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10
2019-07-29 14:26:43 +02:00
Simon Hausmann
ddbebe9dac Stop building debug-and-release packages for MinGW
The requirement to separate debug and release DLLs on Windows stems from
the Visual Studio C run-time library appearing in two different variants
(debug and release) and not mixing well. It's possible to perform builds
without optimzations and with debug symbols while linking against the
release version of the C run-time, but at the same time the debug
version of the run-time brings other developer visible advantages.

MinGW on the other hand does not have this distinction, does not ship
with separate DLLS and does also not require the VS C runtime library.
Therefore we do not need this separation for MinGW, which means that our
packages can be reduced in size and application developers wishing to
debug their applications do not have to use debug builds of the Qt
libraries or run into Qt internal debug code.

This change is in preparation for turning off debug-and-release in qtbase.
Since coin overrides the Qt defaults, this change needs to be applied first.

Change-Id: I2ed6e2c0ae54cf23f78119d115f8d21906859e35
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-07-29 10:39:08 +00:00
Friedemann Kleint
abfbc0668c Disable tests for MSVC2015/Win32/64bit
Frequent crashes of tst_QDir have been again observed recently in the
dev branch with MSVC2015. It should be sufficient to test MSVC2017;
MSVC2015 should only be compile-tested.

Task-number: QTBUG-58654
Change-Id: I0eb5a1294432a24548468c993418bc18671547bb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Dimitrios Apostolou <dimitrios.apostolou@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-07-29 09:35:08 +02:00
Qt Submodule Update Bot
f84c90706d Update submodules on '5.12' in qt5
Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-28 23:30:53 +02:00
Qt Submodule Update Bot
ac2a57b1c3 Update submodules on '5.13' in qt5
Change-Id: I0f92c902424fc5e58158921235b582ef7a7ddc91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-28 22:31:07 +02:00
Qt Submodule Update Bot
71e9322862 Update submodules on '5.13' in qt5
Change-Id: If1822246b0553ed5d550c766a8e3700fd7c14068
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-27 22:31:00 +02:00
Konstantin Tokarev
716640a477 Provisioning: update Conan and Conan packages
[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
    packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
    Python 3 and MinGW
[*] Add license header to conan.ps1

Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:45 +03:00
Konstantin Tokarev
4bf0ba2ba1 Provisioning: Add CompilerException and CompilerThreads settings for Conan
Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:37 +03:00
Konstantin Tokarev
2666f3b216 Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention
Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:24 +03:00
Konstantin Tokarev
535dbcfe96 Conan: Suppress output of New-Item
Change-Id: I3d62fffa08d38a383187726e08743512236bb859
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:18 +03:00
Qt Submodule Update Bot
41abae4367 Update submodules on '5.12' in qt5
Change-Id: I0b682ebd4643a85f04cb2192efb97e8c5230759a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-26 09:59:29 +02:00
Konstantin Tokarev
f12c226463 Provisioning: install-msys2.ps1 must run its commands synchronously
[*] Using bash instead of msys2_shell.cmd allows Start-Process to actually
    wait for the end of command execution.
[*] cpan requires "yes" to be typed by user when it's run first time,
    otherwise it hangs indefinitely waiting for input.
[*] Stop gpg-agent and dirmngr started in the background to prevent
    CI session from hanging.

Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:43 +03:00
Konstantin Tokarev
22c427b369 Use msiexec to install Strawberry Perl from msi package
Currently provisioning fails with following error:  "This command cannot
be run due to the error: %1 is not a valid Win32 application."

Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:41 +03:00
Konstantin Tokarev
645bd71404 Provisioning: Run-Executable should print stdout and stderr to log
Task-number: QTQAINFRA-3085
Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:38 +03:00
Konstantin Tokarev
cb8d38fd9c Provisioning: don't re-run Conan 5 times if there is no error
Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-07-26 07:50:35 +03:00
Qt Submodule Update Bot
f470b8eabe Update submodules on '5.13' in qt5
Change-Id: I0ba5aab5d93df54742604eca6a893cea11cf19c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 22:31:11 +02:00
Qt Submodule Update Bot
c31548830f Update submodules on '5.13' in qt5
Change-Id: Ia71bd5cb97367e0a750e090bfbcacfc89ef41490
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 13:45:26 +02:00
Qt Submodule Update Bot
dd7a80d757 Update submodules on '5.12' in qt5
Change-Id: Ife94a7c6264fbb4525ba2cd0370bdf1ba454b7c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 10:15:39 +02:00
Qt Submodule Update Bot
7001f15765 Update submodules on '5.13' in qt5
Change-Id: Ib6e8c649e6e2f6a9c1fd60a459687426aec1a149
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-23 11:11:30 +02:00
Qt Submodule Update Bot
2237ea6d0c Update submodules on '5.12' in qt5
Change-Id: I09887cc4b1e103b9341f096c4c9164f4a96bd431
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-23 09:59:39 +02:00
Liang Qi
5a16472559 Update submodules on '5.13' in qt5
Change-Id: I5a1af05df086b2ba86dc736714a2eae9db299248
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-23 09:43:03 +02:00
Qt Submodule Update Bot
cfe2c097e9 Update submodules on '5.12' in qt5
Change-Id: Ib0b559d638d7ae6df4129b97f433b168af757443
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-14 23:30:51 +02:00
Michael Brüning
57ea35cace Un-ignore qtwebengine in dev
Change-Id: I72da39c8bfba31fc366b2757f759a4aba070e960
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2019-07-12 21:48:32 +02:00
Qt Submodule Update Bot
e8c8c94278 Update submodules on '5.12' in qt5
Change-Id: Ieb1b3ec8ae527fe13bd1980045f721511ef579a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-07 23:30:56 +02:00
Sona Kurazyan
e4b596fcfe Add the docker images for CoAP test servers
This change includes:
- Docker image for the test server to test non-secure and PSK-based
  CoAP security modes.
- Docker image for the test server to test X.509 certificate-based
  CoAP security mode.

Change-Id: Ice661917591ecaee8ebc3500209bcffc08981f65
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
2019-07-07 11:36:16 +02:00
Qt Submodule Update Bot
b769633c2e Update submodules on '5.12' in qt5
Change-Id: I4c21b50f87410c4c253f510604e3ec80d6b6f929
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-06 17:46:42 +02:00
Liang Qi
bd7b28582f Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-07-06 06:02:12 +02:00
Liang Qi
a319bc5f5f Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: I97c42bef6632a4aeccefab008e0f615f7a9e9f78
2019-07-05 20:05:17 +02:00
Qt Submodule Update Bot
231a5b777c Update submodules on '5.13' in qt5
Change-Id: I39a42574427b32d1d5c73ea96713913674ca7303
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-05 19:27:39 +02:00
Ryan Chu
d49ae7020c Revert "Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)""
This reverts commit 84ff024609.

Reason for revert: <Some VM crashed again when running docker tests>

Change-Id: Iad753c1c4728c6eddc53816e2c51947ce724bf6b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-07-05 08:43:14 +00:00
Qt Submodule Update Bot
bf78588505 Update submodules on '5.12' in qt5
Change-Id: Ief716d10e9e1efcb655f96cc297a3a22ff67839b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-05 09:45:54 +02:00
Qt Submodule Update Bot
e41646897c Update submodules on '5.12' in qt5
Change-Id: I039e035c56bd14a86eb1b309d0372c90b5d737cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-04 06:04:31 +02:00
Qt Submodule Update Bot
ff74cdbe96 Update submodules on 'dev' in qt5
Change-Id: I2bbb20be92c15de518f3c361cffbe2a2f0150c4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-04 06:02:29 +02:00
Qt Submodule Update Bot
c6669046b4 Update submodules on 'dev' in qt5
Change-Id: Ib8778d70ad087c95d92998ae533c6e3fb2412d6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-03 08:58:28 +02:00
Liang Qi
59891119e7 Update submodules on '5.13' in qt5
Skip qtbase in this round.

Change-Id: I49b70268be1be3d29fca34af87d376dc51154aec
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 23:02:59 +02:00
Toni Saario
107fb06016 Fix extra file and missing library in platform configurations
Missing libraries in no-gui platform.
Default.txt was supposed to be removed by
    439a1eb220

Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-02 06:47:59 +00:00
Toni Saario
439a1eb220 Change configuration files into yaml format
Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-01 10:28:29 +02:00
Qt Submodule Update Bot
3ce3dae19b Update submodules on 'dev' in qt5
Change-Id: If2c839bcc7d8fd40f832854d0e729bd811187d85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-01 09:17:20 +02:00
Qt Submodule Update Bot
7eb00bc2c8 Update submodules on 'dev' in qt5
Change-Id: I48275cb9607bc5f7f7f4d50c5c17f2bf537b9538
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-30 03:15:07 +02:00
Qt Submodule Update Bot
1d5641087a Update submodules on 'dev' in qt5
Change-Id: I780c4c7d8894a4933aa908b2a90f2d1d7d069677
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-29 09:19:40 +02:00
Qt Submodule Update Bot
e2fa816df4 Update submodules on '5.12' in qt5
Change-Id: I1bdf6510557ffbc7b3bfd292d18a0f27cb0cee23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-28 16:21:45 +02:00
Tony Sarajärvi
8c4ac28b0d Add correct openSSL arguments to no-gui builds
Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-28 11:43:45 +03:00
Qt Submodule Update Bot
3473922cb4 Update submodules on 'dev' in qt5
Change-Id: I2ede3578fe5d37a8df920fb9736994d25e7da47c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-28 04:27:58 +02:00
Liang Qi
03969bfe23 Update submodules on 'dev' in qt5
Change-Id: Ie0b1c3abcaea4a74279a7001cadecac70c1f853b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-27 14:46:39 +02:00
Qt Submodule Update Bot
daf8327b2c Update submodules on '5.13' in qt5
Change-Id: I40b83973a9cab06f068c8a61f51fded3eddebeef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-25 20:16:42 +02:00
Konstantin Tokarev
3a940903c0 Make header line in qtwebkit.txt longer to prevent parsing error
Change-Id: I0531f91af397d09cfa7eae96c0d779d3055b0456
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-25 10:47:00 +03:00
Qt Submodule Update Bot
1ba5e3b0b9 Update submodules on '5.13' in qt5
Change-Id: I6f19903a3a7cdcf8fb2579b710ccda23427fb91b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-24 22:30:58 +02:00
Konstantin Tokarev
35c1c88749 Update platform_configs for QtWebKit
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I02f6649b77e89b9acb3bdd516419aa12817caaa3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-24 13:02:11 +03:00
Liang Qi
19894d279f Update submodules on 'dev' in qt5
Skip qttools in this round.

Temporarily ignore qtwebengine due to QTBUG-76549.

Change-Id: I93afa1bedb18392a3f6c7ae676690b87f07aeaf9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-24 09:31:56 +02:00
Qt Submodule Update Bot
e7f8eeb30d Update submodules on '5.13' in qt5
Change-Id: I567e22dba0fc0b4c3dd377aa3d37ba0985855ba1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-22 22:30:55 +02:00
Qt Submodule Update Bot
6131434bdf Update submodules on '5.13' in qt5
Change-Id: I62f02ca85e035aa26dc0f9a0ebb4d78e4abc2363
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-20 22:31:38 +02:00
Qt Submodule Update Bot
dedbec30d1 Update submodules on '5.13' in qt5
Change-Id: Ia2ae5b47bc7e4aa094c6ed72d0a7be3bef090387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-19 22:30:48 +02:00
Qt Submodule Update Bot
a04751c10e Update submodules on '5.13' in qt5
Change-Id: I216600c90956b5716b1ce1a787b21417dbc4089a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-18 22:31:30 +02:00
Thomas Hartmann
a0b69977c6 Add qtquicktimeline as a submodule in qt5.git#dev
Task-number: QDS-54
Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-18 11:20:22 +02:00
Liang Qi
d869c671b5 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: Idd621fa568f01f4e4481da61a4e2fb8fe1bdcaba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-18 10:06:49 +02:00
Qt Submodule Update Bot
6f6b43593e Update submodules on '5.13' in qt5
Change-Id: Ifb6609089d41976f649b73df26e9214ab3b49fd4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-17 22:32:31 +02:00
Qt Submodule Update Bot
dcb1c8b41c Update submodules on '5.13' in qt5
Change-Id: Id806418087800e313ee9a14c0a99fcf7215579c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-14 22:31:34 +02:00
Heikki Halmet
644f8b7006 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>

(cherry picked from commit de41591477)
Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-13 22:47:35 +03:00
Qt Submodule Update Bot
09180d3f95 Update submodules on '5.13.0' in qt5
Change-Id: I8883876f4360b207000d7635838fd26adb6a2f73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-13 14:04:22 +00:00
Qt Submodule Update Bot
305278ff93 Update submodules on '5.13' in qt5
Change-Id: I4363311b5e75dd00eb5c869d013b701a2ef7ef49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-12 22:31:12 +02:00
Jani Heikkinen
fd1f34192a Fix qt5.git builds
some '-' is missing from qt5.txt causing coin to ignore all configurations
from that file. So adding enough '-' in title column to solve the issue.

Change-Id: I0b8fa6c98efeece1bf93592bbb60ca627962ceee
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2019-06-12 13:39:26 +03:00
Qt Submodule Update Bot
d063074b0f Update submodules on '5.13.0' in qt5
Change-Id: I0070b9d562cfb57bab5b6fad913e9dbdf2090b48
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-12 10:41:11 +00:00
Qt Submodule Update Bot
7b36e44d7a Update submodules on '5.13' in qt5
Change-Id: Ic3abd12e65592ae218e47b96bf5e80ccf92807e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-11 22:31:13 +02:00
Qt Submodule Update Bot
0d7a64fd8c Update submodules on '5.13' in qt5
Change-Id: I8a94229ad71e5ee71e77bbe27641239f6a6940dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-10 22:30:57 +02:00
Qt Submodule Update Bot
67ba0e70a1 Update submodules on '5.13.0' in qt5
Change-Id: I499cced655cbac696eb8343c1f01bdf00c7dcc9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 11:56:07 +00:00
Qt Submodule Update Bot
bb18b48251 Update submodules on '5.13' in qt5
Change-Id: I07ecded02a10f0d0849de89e36569e88c2d0cf8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-09 22:30:57 +02:00
Qt Submodule Update Bot
f4bbadba41 Update submodules on '5.13' in qt5
Change-Id: I4dae0c7ec72588d61f479074307bbe9515aeb895
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-08 22:31:05 +02:00
Qt Submodule Update Bot
14adbe74dd Update submodules on '5.13' in qt5
Change-Id: Id5b714f25384e8b6db9d314d63344440fa459b17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-07 22:31:13 +02:00
Qt Submodule Update Bot
5bba104a41 Update submodules on '5.13' in qt5
Change-Id: I7bb7197fced3470b41e8d2b77f0af4617607ce97
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-06 22:31:14 +02:00
Qt Submodule Update Bot
50bd689155 Update submodules on '5.13.0' in qt5
Change-Id: I093500e5ebc9e53766233919eaf66dd223529300
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-06 11:39:44 +00:00
Qt Submodule Update Bot
220097d10c Update submodules on '5.13' in qt5
Change-Id: Iad275ca3305f834c0ff484df8c6469931fbcb3d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-05 22:31:55 +02:00
Heikki Halmet
a05bd71ede Disable MySQL from packaging builds
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-06-05 13:25:23 +03:00
Qt Submodule Update Bot
81f478b533 Update submodules on '5.13.0' in qt5
Change-Id: Ib895ddc3b6d81039e6661864d03f1c586a78dbba
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-05 11:55:31 +00:00
Qt Submodule Update Bot
c15485df43 Update submodules on '5.13.0' in qt5
Change-Id: Ie903e4f8177b324ec981a1d57e7c2e0b4f76d585
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-03 10:59:12 +00:00
Ryan Chu
84ff024609 Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)"
This reverts commit 577d01e9df.

Reason for revert: force vmx instructions to Coin level B virtual machine

Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-31 07:30:23 +00:00
Qt Submodule Update Bot
02404b0cec Update submodules on '5.13.0' in qt5
Change-Id: Idc487281a4293ad8cc5ad494b79fd941efc820ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-31 04:08:58 +00:00
Liang Qi
dae67b28ab Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-28 22:15:01 +02:00
Qt Submodule Update Bot
f22f1007f4 Update submodules on '5.13.0' in qt5
Change-Id: I1d1d7dd6d259b26f0c0216efd1976ac79b500e78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-27 06:08:44 +00:00
Liang Qi
5d3976765c Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-26 20:49:48 +02:00
Heikki Halmet
247b429c3c Install prebuilded OpenSSL 1.1.1b for Windows 7
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-26 08:14:11 +03:00
Heikki Halmet
ebcfcbe69a Add Android x86_64 architecture
Task-number: QTBUG-47672
Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-25 08:47:52 +03:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-22 15:34:04 +03:00
Qt Submodule Update Bot
b7c0e2db78 Update submodules on '5.13.0' in qt5
Change-Id: I51a93793234d86494580ec6a9d53b7cd414c888b
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-23 04:17:14 +00:00
Liang Qi
47225925c5 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-22 14:01:42 +02:00
Allan Sandfeld Jensen
edc39be08b Fix qtdeclarative boot2qt CI config
DISTRO_OPTS was missing quotes.

The same thing is also done in 3e6a04c09d.

Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit 04fa1bf4ef)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 10:42:41 +00:00
Juha Karjalainen
230a73409a Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-16 04:14:35 +00:00
Ulf Hermann
3e6a04c09d qtdeclarative platform config: Add missing quotes
Change-Id: Ib8c0a2aad21718dba25728d3ac869c23f314554a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 04:14:30 +00:00
Qt Submodule Update Bot
991500dc85 Update submodules on '5.13.0' in qt5
Change-Id: Ibb7ad97a0fb6cbc2d7d8d77d0fd115c1d602ee07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-16 04:14:23 +00:00
Liang Qi
2e028e620d Bring qt3d back
Task-number: QTBUG-75384
Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-13 14:20:06 +00:00
Qt Submodule Update Bot
e6c0dc1d60 Update submodules on 'dev' in qt5
Change-Id: I370770bdc8179075f4e5e01e54a29591fd7caa16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-13 05:30:49 +00:00
Liang Qi
faf54c4cec Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I3eb42ce8a43418919c9bb8d0ac4d3714aea94fac
2019-05-12 20:36:18 +02:00
Qt Submodule Update Bot
7d1d1aa2d2 Update submodules on '5.13' in qt5
Change-Id: I0e6e46b247198ce68668222e555e3ebf256729bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-12 15:51:20 +00:00
Liang Qi
6fbaba5d52 Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: Ib80ac156ec8ce5690d5ec784c671bd706afe0b4e
2019-05-12 11:12:36 +02:00
Aapo Keskimolo
9c49284978 Remove redundant windows configuration
The windows configuration was added by commit

 8cdf60fe64

which was unintended and caused breakages due to wrong library paths.

Regression was introduced by 65d4cea3ac12a5d585da7ee1ba2933a3c23051b8 which
allowed sharing storage paths with builds with different configure arguments.

Change-Id: I18d12c4ff86a5bb28484c7b39ca38ff4f6f590d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-12 07:29:17 +00:00
Qt Submodule Update Bot
494d10fb73 Update submodules on '5.13' in qt5
Change-Id: Ieb925882ea0c8b536bde7f9a1d63aecdf6213632
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-09 20:44:40 +00:00
Liang Qi
192372bb56 Update submodules on 'dev' in qt5
Change-Id: I085f25a148ddc404f399e79924968acfd6b7de07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-09 19:50:49 +00:00
Liang Qi
f557e0634f Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
2019-05-09 15:27:08 +02:00
Liang Qi
a66a54035c Update submodules on 'dev' in qt5
Temporarily ignore qt3d until it got fixed correctly.

Task-number: QTBUG-75384
Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-09 12:57:41 +00:00
Liang Qi
0a1e27b33e Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: Ibab4a9d55ce371259f52edb1819a397c1f2d7d9e
2019-05-09 12:04:02 +02:00
Tony Sarajärvi
8cdf60fe64 Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-08 09:18:56 +00:00
Qt Submodule Update Bot
819362c5d6 Update submodules on '5.13.0' in qt5
Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-08 06:47:41 +00:00
Liang Qi
8f63da629a Merge remote-tracking branch 'origin/5.13' into 5.13.0
Change-Id: If2321aae395ea99c0fb4cf4ef7b3c5a580d3357e
2019-05-07 14:58:36 +02:00
Tony Sarajärvi
049eb21a1d Replace RHEL 7.4 with 7.6 in the CI
Task-number: QTQAINFRA-2942
Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-07 07:15:58 +00:00
Qt Submodule Update Bot
c6b018a925 Update submodules on '5.13' in qt5
Change-Id: Ib948b49eccead6649f228a3d7acc83a2f6522660
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-06 06:56:28 +00:00
Liang Qi
aeea2c8425 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia93633ae4ef9677ede751467a70e8f91799829a2
2019-05-04 11:04:32 +02:00
Qt Submodule Update Bot
4c4595b93b Update submodules on '5.13.0' in qt5
Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-03 09:15:06 +00:00
Qt Submodule Update Bot
c2506b0f9c Update submodules on '5.13' in qt5
Change-Id: I99a2129b1f73fc1dd801b406b9741cdfea37429e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-03 07:32:05 +00:00
Juha Karjalainen
6465c42122 Provisioning: install msys2
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-03 07:30:44 +00:00
Qt Submodule Update Bot
ea052ceb0a Update submodules on '5.13' in qt5
Change-Id: I4f9b2ff00e79cf16a9effd6bdffa679a7f25b50b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-02 09:04:01 +00:00
Qt Submodule Update Bot
d27f9e9b88 Update submodules on '5.12' in qt5
Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-30 18:44:54 +00:00
Kari Oikarinen
b692cf823a Adjust submodule branches
Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2
2019-04-29 11:48:19 +03:00
Liang Qi
22bb88ed07 Update submodules on '5.12' in qt5
Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-26 05:46:36 +00:00
Liang Qi
ffe0c11420 Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into refs/staging/5.12 2019-04-26 05:46:30 +00:00
Liang Qi
6dd08088fc Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: Ib5cb484726a93f7b317e1dd8e74b446e6673cdbd
2019-04-25 16:05:59 +02:00
Simo Fält
09f28e9e1d Provisioning: Install python36-devel to rhel 7.4
The rhel Python3 system package is missing development libs.

Fixes: PYSIDE-996
Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-25 12:58:28 +00:00
Heikki Halmet
65cf2cb957 Provisioning: Install Vulkan to Rhel 7.4
Enables Vulkan support at compile time

Task-number: QTBUG-72763
Change-Id: If97adb030d50a147c9714afe3ef360291904b58a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-25 09:29:05 +00:00
Qt Submodule Update Bot
766fc425e3 Update submodules on '5.12' in qt5
Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-24 16:37:45 +00:00
Heikki Halmet
5db0ce74b7 Provisioning: Update QNX 7.0 packages
Updated packages includes QNX Multimedia Suite 2.0,
which enables building QtMultimedia QNX plugins

Task-number: QTBUG-71073
Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-04-24 13:27:06 +03:00
Qt Submodule Update Bot
a4e4c13f01 Update submodules on '5.13' in qt5
Change-Id: I43c1b4dac692f6c93702d05d3ee2a2ec224b2736
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-28 21:59:04 +02:00
Liang Qi
9d3f29dc03 Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-05-27 15:18:06 +02:00
Liang Qi
7ef9985e4e Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: I56973a90b028a77c3692f790648b605622af4af6
2019-05-27 15:18:06 +02:00
Qt Submodule Update Bot
a0291fde84 Update submodules on '5.13' in qt5
Change-Id: I5b52a5c17a612ba62948c01696e71c88bd84e85c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-05-24 16:22:05 +02:00
Qt Submodule Update Bot
3e6f5b1486 Update submodules on '5.13' in qt5
Change-Id: Icc5ec39c45931aec77ca5287c14d08902ec6c551
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-21 13:48:00 +02:00
Allan Sandfeld Jensen
04fa1bf4ef Fix qtdeclarative boot2qt CI config
DISTRO_OPTS was missing quotes.

Change-Id: Iffcfce8e34f95b5a0c0f0309b26291b31b12a7dc
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-05-13 18:20:59 +00:00
Heikki Halmet
dbaa42baa7 Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-23 06:04:34 +00:00
Qt Submodule Update Bot
12cde4e0da Update submodules on '5.12' in qt5
Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-23 04:06:25 +00:00
Heikki Halmet
91ab567a64 Provisioning: Upgrade PyYAML because of possible security vulnerability
Known high severity security vulnerability in pyyaml v< 4.2b1

Task-number: QTQAINFRA-2888
Change-Id: I6522fc66ca7c4323cc6248ec2cb31c62201f8e84
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-18 14:35:52 +03:00
Tony Sarajärvi
d494d76c26 Add a no-opengl build on Ubuntu 18.04
Task-number: QTQAINFRA-2577
Change-Id: I815adf0f85f688d9d584b95122d1944cb4b660c1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-26 10:14:17 +03:00
Tony Sarajärvi
670aa09aba Provisioning: Fix cleanup when building GCC from sources
We need sudo rights to delete the temporary folder
where sources for GCC are extracted.

Change-Id: Ic0642e44eabfc3449f7ce5903a63bd38924f7dca
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-16 13:45:06 +03:00
Qt Submodule Update Bot
2fd2a20f18 Update submodules on '5.12' in qt5
Change-Id: I5476ca1d214e18ba91b313f9a742d31fc9e04fe7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-26 09:24:40 +02:00
Qt Submodule Update Bot
c06ab02f33 Update submodules on '5.12' in qt5
Change-Id: I961e20f994ffcbc97b822f53069cc3bd5a399345
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-25 10:30:36 +02:00
Oliver Wolff
0c339c29d6 platform_configs: Add missing "Configure arguments" to qtconnectivity.txt
Without the tag configure arguments will not be parsed by Coin so that
wrong configurations will be used.

Change-Id: I02f84cde07e9e4cf878add89ba9ba43dacf9d567
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-25 10:29:17 +02:00
Liang Qi
dc4790e751 Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12" 2019-06-25 10:29:08 +02:00
Liang Qi
34a13ff5d9 Merge remote-tracking branch 'origin/5.12.4' into 5.12
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
2019-06-25 10:29:08 +02:00
Qt Submodule Update Bot
4048c76e65 Update submodules on '5.12' in qt5
Change-Id: Idb8c2824d7d6d7359b0845fcb200d1331029cec9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-21 10:16:38 +02:00
Qt Submodule Update Bot
6361946518 Update submodules on '5.12' in qt5
Change-Id: I3b189f1cfbf6898e35b91eb821485f3b9eeb678b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-19 10:31:09 +02:00
Qt Submodule Update Bot
bb8b7c5140 Update submodules on '5.12' in qt5
Change-Id: I673d342cd906782d8444eebcb8e16ad6cec827f0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-18 13:23:09 +02:00
Liang Qi
452e0d94d4 Update submodules on '5.12' in qt5
Ignore qtvirtualkeyboard temporarily.

Task-number: QTBUG-76371
Change-Id: I6d62f0f60b30044baaef092cbd8066bbca8d0df7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-18 10:36:33 +02:00
Antti Kokko
6e350aff34 ogl-runtime: instead of linking to qt5.txt use the actual configuration
Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-12 15:15:32 +03:00
Qt Submodule Update Bot
e926f95049 Update submodules on '5.12.4' in qt5
Change-Id: I2b8b3fc60e242872f1cfb850c6219a72b39d471a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-13 03:10:05 +00:00
Heikki Halmet
d87d4e0219 Disable MySQL from packaging builds
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a05bd71ede)

Change-Id: I97d1d06b266490080325126e2dd715436a91b01a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 05:52:55 +00:00
Heikki Halmet
de41591477 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 08:29:02 +03:00
Qt Submodule Update Bot
0e454d2a14 Update submodules on '5.12.4' in qt5
Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-11 04:05:34 +00:00
Jani Heikkinen
01c38dfad8 Use link to qt5.txt instead of copy in qt3d-runtime.txt
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 
(cherry picked from commit c5e443374a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-09 17:18:19 +03:00
Antti Kokko
1db94fc9ef Add platform configuration file for ogl-runtime repository
Use configuration from qt5.txt.

Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 11:49:11 +03:00
Qt Submodule Update Bot
fb534d1b44 Update submodules on '5.12.4' in qt5
Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:19:00 +03:00
Heikki Halmet
acff1703e4 Install prebuilded OpenSSL 1.1.1b for Windows 7
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 247b429c3c)
2019-06-10 10:19:00 +03:00
Juha Karjalainen
c8deeb3d05 Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 230a73409a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:19:00 +03:00
Juha Karjalainen
b9e92adf59 Provisioning: install msys2
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6465c42122)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:06:56 +00:00
Juha Karjalainen
31f5c48a80 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3e838f2a34)
2019-06-10 10:07:20 +00:00
Tony Sarajärvi
5fd662b550 Fix platform configuration files
Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 
 
(cherry picked from commit d77fdecc11)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:58 +03:00
Tony Sarajärvi
6c6c6ca1a5 Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8cdf60fe64)
(cherry picked from commit d49c0cd0bb)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:52 +03:00
Tuomas Heimonen
1cf289d182 Remove tests from Saferenderer static build
Task-number: QSR-458

Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

(cherry picked from commit 3cc1c40ff5)
Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 17:25:13 +00:00
Heikki Halmet
a2b1dd2d0a Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dbaa42baa7)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Heikki Halmet
608788de2d Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c09135cb56)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Qt Submodule Update Bot
b611da5b35 Update submodules on '5.12' in qt5
Change-Id: Ibd78f70d7795b3927093d1f7de3cb59db2693cac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-05 23:31:03 +02:00
Tony Sarajärvi
d77fdecc11 Fix platform configuration files
Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-04 11:10:57 +03:00
Liang Qi
b825df16f2 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ibe33457533596f164b2d6342329378604e845720
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-03 08:38:33 +02:00
Tony Sarajärvi
d49c0cd0bb Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8cdf60fe64)
2019-05-29 15:09:40 +03:00
Tony Sarajärvi
f70bdd89b1 Update GCC version to 9.1.0 in Ubuntu 18.04
Task-number: QTQAINFRA-2958
Change-Id: I3ea8c8e467b9a1f56c2b114c40fb94dfdc1448d0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-31 11:30:45 +03:00
Qt Submodule Update Bot
849df311b1 Update submodules on '5.12.4' in qt5
Change-Id: I73e3a64a4f9b0255c6e82ba638bf1f783e9867db
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-27 16:39:39 +02:00
Frederik Gladhorn
1e290229e4 Adjust submodule branches 2019-05-21 19:42:01 +02:00
Tuomas Heimonen
25349a29f7 Remove examples from Saferenderer static Windows build
Task-number: QSR-458
Change-Id: I3f0ba66590683ea221ccd207026602b3b89ee3a9
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2019-05-21 09:59:12 +03:00
Simo Fält
da9aac698d Provisioning: Install virtualenv to Ubuntu 18.04
The python3-virtualenv package is missing the actual virtualenv
executable. python3-virtualenv will get installed as dependency.

Change-Id: If474831e8f46ac5dcd7e1028c97c7322c5e41b9d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 10:13:58 +03:00
Jani Heikkinen
c5e443374a Use link to qt5.txt instead of copy in qt3d-runtime.txt
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-05-08 12:53:18 +03:00
Tuomas Heimonen
3cc1c40ff5 Remove tests from Saferenderer static build
Task-number: QSR-458
Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2019-05-27 09:12:34 +00:00
Tony Sarajärvi
8d8b7d796f Enable a no-gui build on Ubuntu 18.04
Task-number: QTQAINFRA-2576
Change-Id: Iafdecb0571779077b722bde7521da681f00f6f60
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-27 10:31:13 +03:00
Qt Submodule Update Bot
1f80c520df Update submodules on '5.12' in qt5
Change-Id: I6a580364ce78fdb792eab228d4ace789fb6e5c25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-05-24 15:42:57 +02:00
Qt Submodule Update Bot
3897888655 Update submodules on '5.12' in qt5
Change-Id: Ib9074112780183225f5620edb3d02fa60f3af4c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-21 18:01:32 +02:00
Heikki Halmet
7e0fe78315 Add static build for Saferenderer
Task-number: COIN-229
Change-Id: I1808dbcf53a4e070167b485404c8cf9747dc04f5
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-05-03 14:18:33 +03:00
Akseli Salovaara
56134fd7f6 Remove Packaging feature flag from UWP 2015 x86 integrations
UWP 2015 x86 binaries are not published anymore. Speed-up export
tool and reduce exported data disk space consumption by removing
Packaging feature flag from UWP 2015 x86 configurations.

Task-number: QTBUG-73544
Change-Id: Iad2016b6e6aec1787c7bbf31c6ef6f71db905c21
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-17 09:10:32 +00:00
Juha Karjalainen
94d140b746 Log more version information on macOS provisioning
Logs more version information to make easier to reproduce build.
Logs macOS build version, homebrew installed packages and apple's
installer installed packages.

Change-Id: Ia9f2842a3fd2e8e0acf1667c7435a19c7a878aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-12 15:47:26 +00:00
Tony Sarajärvi
8f073cea69 Do DeveloperBuild for Boot2Qt
Task-number: QTBUG-63152
Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-12 13:02:16 +00:00
Qt Submodule Update Bot
a41e568a78 Update submodules on '5.12' in qt5
Change-Id: Ie7ea68d3f32ca9348ca7f5f7017f6e86c00b860d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-08 09:33:16 +00:00
Heikki Halmet
e72a082da5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b3e35cbac5)
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-18 10:01:57 +00:00
Qt Submodule Update Bot
712d5447bf Update submodules on '5.12' in qt5
Change-Id: I01acdb8d1dc3137abb193a9ccf1dba20d6953bcb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-16 21:19:06 +00:00
Qt Submodule Update Bot
3436df53cf Update submodules on '5.13' in qt5
Change-Id: I4b003f32744fbf25b6439b555a01ee130d50467e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-16 20:51:24 +00:00
Liang Qi
577d01e9df Provisioning: disable docker test servers on Windows 10 (x86_64)
This reverts commit 177df80f09 partially.

Change-Id: I6c091ad48397ad221090274144ac88dfa47c0e0f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-04-16 08:57:44 +00:00
Liang Qi
e10a2d4ffe Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	.gitmodules

Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
2019-04-14 23:11:30 +02:00
Liang Qi
74eab55ea8 Update submodules on 'dev' in qt5
Change-Id: Ibb626ef0429631b901bfb894935b12cad1af6a5c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-14 20:26:28 +00:00
Qt Submodule Update Bot
da9243a97b Update submodules on '5.12' in qt5
Change-Id: Ie4120272ceba142d35265f2fbde316e2af8b30a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-14 06:51:45 +00:00
Qt Submodule Update Bot
f2af07b8ed Update submodules on '5.13' in qt5
Change-Id: Icdc234fca978fd0f510462390b7de537485c7d25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-13 20:30:54 +00:00
Qt Submodule Update Bot
085407eb93 Update submodules on '5.13' in qt5
Change-Id: I6052700191cd9ebd56e1f97fd0f7d52bdb5ef62e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-13 17:15:26 +00:00
Liang Qi
8710c7d9cf Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
2019-04-13 11:38:39 +02:00
Qt Submodule Update Bot
869c15629d Update submodules on '5.13' in qt5
Change-Id: Ifb78bd23df6129ccb226b7e0862ebe5620353b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-13 07:32:12 +00:00
Qt Submodule Update Bot
f31970d5ac Update submodules on '5.12' in qt5
Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-12 17:40:23 +00:00
Qt Submodule Update Bot
bf868c7e7a Update submodules on '5.13' in qt5
Change-Id: I64ac0b2aeaaed0908aaebff7c45b486b8159e893
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-12 17:05:13 +00:00
Qt Submodule Update Bot
21a6541aeb Update submodules on '5.12' in qt5
Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-11 16:03:13 +00:00
Juha Karjalainen
48443b4b9a Provisioning: update python 2.7.14 to 2.7.16
Python 2.7.14 used tlsv1 which is no longer accepted by github
thus needing update to newer version.

Task-number: QTQAINFRA-2900
Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-11 06:10:22 +00:00
Juha Karjalainen
d269710383 Change linux webasembly build from devoloper build to release build
Change-Id: Ic2481d69b69e6bc50d583adf5e1d2857abc6ec25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-11 06:09:11 +00:00
Qt Submodule Update Bot
403d4e1d96 Update submodules on '5.13' in qt5
Change-Id: I1e38740b9e4f4c9570d02d5b131def095418778f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-11 05:48:40 +00:00
Qt Submodule Update Bot
314db90904 Update submodules on '5.13' in qt5
Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-10 10:43:51 +00:00
Heikki Halmet
791ec923a7 Provisioning: Echo Emscripten version information to versions.txt
Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-10 06:06:56 +00:00
Qt Submodule Update Bot
6db224cfc7 Update submodules on '5.12' in qt5
Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-10 06:06:53 +00:00
Heikki Halmet
b3e35cbac5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-09 09:17:20 +00:00
Qt Submodule Update Bot
261cc1bd8f Update submodules on '5.12' in qt5
Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-09 03:39:42 +00:00
Ivan Donchevskii
338fce191a Provisioning: Install i686 mingw on Windows 10 X64
Required to compile 32-bit binaries.

Fixes: QTQAINFRA-2896
Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-08 06:36:50 +00:00
Alex Blasche
16201ab31d Deprecate QtXmlPattern module
Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-04-08 06:28:02 +00:00
Heikki Halmet
c654e63c87 Update Windows 10, MSVC 2015 and MSVC 2017
Windows 10 updated to build 1809
msvc2015 update 3 14.0.25431.01
msvc2015 update 3 (KB3165756)
msvc2017 5.18.2 4.7.03056

ms-zune is no longer available in the latest
Windows 10 version

dotnet and msvc 2015 update patch installation
moved to pre-provisioning. Msvc 2015 update patch installation
seems to be flaky with this windows version.

Task-number: QTBUG-68190
Task-number: QTQAINFRA-2255
Task-number: QTBUG-71125
Change-Id: I87defffa488cb75f7de0909020073b35476bea80
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-05 05:04:34 +00:00
Liang Qi
8630f18d1e Only update qtwebengine in this round
Change-Id: Ic8a307e2a3dd774adf6484894531b9a177bec58f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-05 05:04:27 +00:00
Tony Sarajärvi
b2afcc8405 Fix shellcheck complaints from provisioning scripts
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:59 +00:00
Tony Sarajärvi
f678ae3769 Fix soft links and file modes of a few macOS provisioning scripts
Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:52 +00:00
Heikki Halmet
c09135cb56 Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-01 11:42:49 +00:00
Qt Submodule Update Bot
2f59bd5fbe Update submodules on 'dev' in qt5
Change-Id: I619cf4f0168d08cb2e94b23db557d9a53f9e5338
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-31 07:59:08 +00:00
Qt Submodule Update Bot
b9da3a4bda Update submodules on 'dev' in qt5
Change-Id: I393b5619168e820b3ffbcf7263c47c93abb81aa9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-30 14:05:17 +00:00
Qt Submodule Update Bot
7eeee0df43 Update submodules on '5.13' in qt5
Change-Id: I81587903b3fdf6d68c3e91d0c6d21c591e2746a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-29 21:05:29 +00:00
Qt Submodule Update Bot
b9e40e2fd7 Update submodules on '5.12' in qt5
Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-28 19:35:06 +00:00
Qt Submodule Update Bot
35b489b1bd Update submodules on '5.12' in qt5
Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-27 20:11:53 +00:00
Qt Submodule Update Bot
4f268edc88 Update submodules on 'dev' in qt5
Change-Id: I799f3265c9b6d28de248fc55685b77ea26039816
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-24 18:01:13 +00:00
Qt Submodule Update Bot
4d427ae04f Update submodules on 'dev' in qt5
Change-Id: Ib8090cd0a47e284dc7197cf4614d63d2e2e127a9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-23 19:07:16 +00:00
Qt Submodule Update Bot
eb3c52455c Update submodules on '5.13' in qt5
Change-Id: I2a21f0c7eabe7697691bbe330fd0c74058997bb1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-23 08:32:55 +00:00
Qt Submodule Update Bot
d8a1801f1d Update submodules on 'dev' in qt5
Change-Id: I46929f3d189bc07ee3a9f95cb539bdae57d6d10d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-22 08:18:51 +00:00
Qt Submodule Update Bot
3003529631 Update submodules on '5.13' in qt5
Change-Id: I0c15efb52ebac506133653336a16d09174bb938f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-21 19:49:57 +00:00
Qt Submodule Update Bot
24de703f26 Update submodules on 'dev' in qt5
Change-Id: I6c78b9e00e9bdbf579e8b423b42499bea822ceca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-18 06:19:33 +00:00
Liang Qi
4978e6f835 Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	coin/provisioning/common/windows/helpers.ps1

Change-Id: If35fe38af7b7b1c4bba5009180fe51f37a90aa5c
2019-03-17 21:43:11 +01:00
Qt Submodule Update Bot
5df387f924 Update submodules on 'dev' in qt5
Change-Id: Id296241c270ea33450e57ef07b382930711daa89
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-17 19:56:49 +00:00
Qt Submodule Update Bot
7158816eed Update submodules on '5.13' in qt5
Change-Id: I9b5cfc02f045711d84084dd52e3add7baa3a0722
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-17 19:56:39 +00:00
Maurice Kalinowski
3d087c5a6a Split docker provisioning files
Split the creation of the test images and the creation of the
docker environment. This way, one can easily recreate the test
images, without requiring to re-provision everything.

Change-Id: I35bbe8d8bf497f16d9be92cbaa2d9001f8eee247
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
2019-03-15 12:14:20 +00:00
Liang Qi
ca9f9b9cc4 Update submodules on 'dev' in qt5
Change-Id: I7484fcfc4915d0e22057b671bba6e63243452ceb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-15 12:14:13 +00:00
Juha Karjalainen
48ab1d879b Fix provisioning disable defragmentation for windows
If no scheduled task exist it would throw error causing
provisioning to fail. Now catch when scheduling does not exist.

Task-number: QTQAINFRA-2823
Change-Id: I3bf24df6116b6c978171950bf5bf954f5ddee533
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-03-15 09:13:16 +00:00
Qt Submodule Update Bot
deecc97dc2 Update submodules on '5.13' in qt5
Change-Id: Ibd880c74a5842a88d8ee0a8cb1eaf3487b4f7192
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-14 17:00:45 +00:00
Liang Qi
e6e5e7b2ee Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	.gitmodules
	coin/provisioning/common/macos/docker_testserver.sh

Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab
2019-03-14 12:36:04 +01:00
Liang Qi
bbce3228af Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/provisioning/common/linux/emsdk.sh

Change-Id: I9ba6a1c52b70b605f0f856b6ce6912fd499792a3
2019-03-14 12:10:15 +01:00
Qt Submodule Update Bot
0545584315 Update submodules on '5.13' in qt5
Change-Id: I8c823bab00e24f89a748986bf3eacf12d8de1d46
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-13 20:33:23 +00:00
Qt Submodule Update Bot
4c46984c46 Update submodules on '5.13' in qt5
Change-Id: I87f15314cf01a1b0482b1675c1eeaed380d92a3d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-13 09:12:10 +00:00
Qt Submodule Update Bot
fc1d5bbe4c Update submodules on '5.13' in qt5
Change-Id: I696da0adc9f8f11c08765662016972d4c47a8a04
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-11 05:16:35 +00:00
Qt Submodule Update Bot
9a5d221afc Update submodules on '5.13' in qt5
Change-Id: I85f2cd016dc8c3e98e39ebee057d1d6bfc71d19b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 12:09:53 +00:00
Qt Submodule Update Bot
a99977cf78 Update submodules on '5.13' in qt5
Change-Id: I20b6331abe3a914c5cf2503be61c34e2efe60016
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-05 06:41:28 +00:00
Liang Qi
ed3d7f6cf5 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I4384f32d093aaaad73146e661bc3f3a56d57328d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-04 20:02:56 +00:00
Qt Submodule Update Bot
bec94435f8 Update submodules on '5.13' in qt5
Change-Id: I798c8bc1278a02cdf9043ed50eade5ff66b6502d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-02 21:38:04 +00:00
Heikki Halmet
abfc2cd571 Provisioning: Update emsdk version
Task-number: QTBUG-73867
Change-Id: I4caab8d434787bf4323e1ea3232bf4bf23c1ec8d
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2019-03-02 06:29:52 +00:00
Mårten Nordheim
5c9979a995 Add docker container with iptables
Used for dropping packets on a specific port.

Needs to be launched with the NET_ADMIN and NET_RAW capabilities to be
able to actually be able to interact with iptables, this is done in
docker-compose.

Change-Id: I5093d19fbc269f42fe3e314e9344866fa5b79999
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-02-28 10:36:30 +00:00
Mårten Nordheim
03a0872a34 Add docker container with Cyrus
For its imap server, needed in various tests

Change-Id: I7ad11342f362392edec2f15c781f4c48deeeff30
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-02-28 10:36:27 +00:00
Mårten Nordheim
9d0022ee44 Add docker container with xinetd
Needed in the QUdpSocket test for the echo service and in the QSslSocket
test for the daylight service.

Change-Id: Ic7143eb7abd37dbf2c20ddb4b52cdd5ea3f0d193
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-02-28 10:32:59 +00:00
Qt Submodule Update Bot
e9d5fdaa20 Update submodules on '5.13' in qt5
Change-Id: I33af247c322de51b34dc65381be9e4e03261842d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-27 16:46:26 +00:00
Liang Qi
2d0e6b81dd Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/provisioning/common/windows/android-openssl.ps1

Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb
2019-02-27 12:43:22 +01:00
Qt Submodule Update Bot
4e99a6976c Update submodules on '5.13' in qt5
Change-Id: I7bf5a68c37be83ba2ad4e67ba24bcae7243297a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-26 09:31:40 +00:00
Heikki Halmet
d5c96aad5a Provisioning: Remove docker from macOS provisioning
When docker provisioning starting test-server in virtual box whole
virtual machine will reboot.

Let's remove docker until it's more stable or we know how to fix it.

Task-number: QTQAINFRA-2801
Change-Id: Iad7437a69c954a90522e44ef27015518fa3f8c1e
(cherry picked from commit 1865b99b527bd9eee80c39e95d47a44096e44e6a)
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-02-23 13:37:10 +00:00
Heikki Halmet
06fb909429 Provisioning: Change installation order for dotnet-framework
Windows updates can't be disabled before dotnet-framework is enabled

Task-number: QTQAINFRA-2824
Change-Id: I26c6b9d9aacfd8031a0b05ce48e003822aec3bdc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-02-23 10:56:58 +00:00
Heikki Halmet
da2bd45ba6 Provisioning: Update mysql to Windows
Currently this is the last version that support x86 for at least Windows.

Task-number: QTQAINFRA-1996
Change-Id: Idd55694837afad2188697b4d5cc009a127ddb760
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2019-02-18 07:43:26 +00:00
Samuli Piippo
abbd43c943 Provisioning: update ARMv7 and ARM64 toolchains
Update toolchains to Yocto Sumo release with GCC 7.3.0

Task-number: QTQAINFRA-2630
Change-Id: I078cfebde1df039a3783f76c37f914f0dda0483f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-02-18 07:41:18 +00:00
Juha Karjalainen
ce91433364 Fix failing to disable windows update service
Sometimes when trying to stop windows update service it fails.
Will now retry disabling wuauserv

Task-number: QTQAINFRA-2632
Change-Id: I5b6bf40aa15bb1f5225dc51e2f7212a01a13e9a6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-02-14 15:22:56 +00:00
Liang Qi
b0afdd4bc7 Update submodules on '5.13' in qt5
Change-Id: Ie526118f93295f56e0c2bf951c6fe8ab2b427eea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-14 11:18:47 +00:00
Jani Heikkinen
2471d6dab8 Update qtwebengine
Change-Id: I4f70e86ee6f22dd4e14780b606294ca26d0e4007
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2019-02-09 19:15:13 +00:00
Qt Submodule Update Bot
7bd38a4997 Update submodules on '5.13' in qt5
Change-Id: I1653a60f6c0b5dab394b364814bcabf566090498
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-08 09:47:56 +00:00
Qt Submodule Update Bot
ab438507e9 Update submodules on 'dev' in qt5
Change-Id: I6bae6951b1c9253a423cd2d0d38ffea6121415a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-07 19:47:54 +00:00
Qt Submodule Update Bot
26ff9bdc3d Update submodules on '5.13' in qt5
Change-Id: I3fe91983a4719ccd77146ed63165a7939358c3c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-07 17:33:49 +00:00
Tony Sarajärvi
9b84c7135b Build MIPS64 with b2qt toolchain
This configuration verifies big endian builds

Task-number: QTQAINFRA-2492
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 80339a10a4)
Change-Id: I3111190b5c924eb73b037b94be1a0dc48bcc68c2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-02-07 17:33:41 +00:00
Liang Qi
84aa9b73ad Merge remote-tracking branch 'origin/dev' into 5.13
Change-Id: If5219843c4f0d4b34fe56a826d0e9bb17d92f877
2019-02-07 09:31:51 +01:00
Qt Submodule Update Bot
d926dbe415 Update submodules on 'dev' in qt5
Change-Id: I78814e361bf5574ed190fc2d98cdc050bb54815e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-06 07:03:59 +00:00
Qt Submodule Update Bot
73f1d0f518 Update submodules on '5.13' in qt5
Change-Id: I9fbaaaf4870edefceb1a4557799c41077002aaa0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-06 07:03:09 +00:00
Qt Submodule Update Bot
99b46f7dec Update submodules on 'dev' in qt5
Change-Id: I8c6d0d5c7679930ca05961dcaac3c71d2819cba8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-03 03:49:49 +00:00
Tony Sarajärvi
80339a10a4 Build MIPS64 with b2qt toolchain
This configuration verifies big endian builds

Task-number: QTQAINFRA-2492
Change-Id: I19a8437c5320e7acb97a26fbd5fd62596d3b0fb4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-02-02 13:16:50 +00:00
Ryan Chu
5cfa5637ba Provision docker test servers based on Ubuntu 18.04
Comparing to the previous release, Ubuntu 18.04 includes dante-server
1.4.2 by default. Therefore, it doesn't rely on the Third-party PPA.

The SHA-1 of the provisioned images in docker cache:
qt-test-server-apache2_18.04:69478e75b362d57691a53700434a7034d471459e
qt-test-server-squid_18.04:cd5a5e2ff5d23c9a7adef1bd82847e027c090e5b
qt-test-server-vsftpd_18.04:a40425c0494f8f4e8ba27ac9fb5cc02aaedd62d8
qt-test-server-ftp-proxy_18.04:5f78e23a0579a579fcae7f3e5704bb5eec0e2f6d
qt-test-server-danted_18.04:d590b915cda9d524620d18a0398fdfa4d5876f97

Change-Id: Iffb4abe144a957465a2daab657c6259f0b75e800
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-02-02 12:23:22 +00:00
Ryan Chu
b4b2152dd3 Start the docker machine and update with new TLS certificates
After the system reboots, the docker machine is created, but in a
stopped state. To handle the case that a developer may rerun the
provisioning scripts for the missed docker images, make sure the
docker machine is both started and running with new TLS certificates.

Change-Id: Ibdb58152cac860132a77d6d094f9bca20a5e95e8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-02-02 12:23:18 +00:00
Ryan Chu
177df80f09 Docker Provisioning: Install docker test servers on Windows 10 (x86_64)
Build and cache docker images to VirtualBox virtual machine.
1. Download and install the docker tool kits and Apple Bonjour
2. Deploy boot2docker image into VirtualBox via docker-machine commands
3. Use Git Bash to run the shared provisioning scripts
4. Print CPU features to verify that CI has enabled VT-X/AMD-v support
5. Disable Hyper-V from Windows 10 Pro/Enterprise editions

Change-Id: I5520e4a28376aba14f880c077bd7b083be971f0a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-02-02 12:23:15 +00:00
Ryan Chu
ab3e34827a Display the provisioned version of docker tool kits
For debug purpose, print the installed version of docker,
docker-compose, and docker-engine. Because 'docker info' is related to
the docker-engine, postpone calling the command until docker virtual
machine has been created.

Change-Id: I4c869b7122b831b7f22c9c3846ac9cbe47c3b355
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-02 12:23:11 +00:00
Ryan Chu
b97e448ba4 Move and merge the provisioning scripts of docker to a shared folder
To reuse the provisioning scripts for all platforms, they are moved to a
shared folder (coin/common/shared/testserver). The scripts of macOS and
linux are combined and controlled by an input parameter (macos/linux).

Change-Id: Ibf9a438d1825d01d707c2fc8fbcf2bc70a8b4902
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-02-02 12:23:07 +00:00
Qt Submodule Update Bot
1830cca2bc Update submodules on 'dev' in qt5
Change-Id: Ie71dc26e772ace0d4a7ab51360ad4abe1448d438
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-01 20:55:10 +00:00
Juha Karjalainen
366eaceff0 Change order in which certain provisioning scripts are run
Disables windows update and defender  now earlier in provisioning.

Task-number: QTQAINFRA-2592
Change-Id: I4cc380830695a97f02b54ab904e2f6192fc36d44
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-29 15:24:41 +00:00
Juha Karjalainen
afbd9305e3 Fix provisioning failure when unsetting proxy with no proxy
When unset-proxy.ps1 script is run when there is no proxy set
unset script fails leading provisioning to fail. Now will check
if  proxy is set before removing registery keys for it.

Task-number: QTQAINFRA-2311
Change-Id: Ic50bcebc634bb90385ca817dac9bed24e9e897ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-29 15:24:38 +00:00
Qt Submodule Update Bot
044f079158 Update submodules on 'dev' in qt5
Change-Id: If01f147a0f76b8075492ebb6baedc832de7611b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-29 15:24:35 +00:00
Liang Qi
b40d27b808 Update submodules on 'dev' in qt5
Change-Id: Ic263e48fc994a7c77c0198e6544395f4facee760
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-29 08:33:51 +00:00
Paul Wicking
3793e0ddfc Adjust submodule branches 2019-01-28 14:37:50 +01:00
Jani Heikkinen
77a73f65df Add qtlottie as a submodule in qt5.git#dev
Task-number: QTBUG-72945
Change-Id: Ib8daf1541e7ff5dca70e8a1c7bec48ee02d0eb59
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-01-25 11:06:21 +00:00
Liang Qi
85eb7b7a03 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	coin/platform_configs/default.txt

Change-Id: Ie21baa51738ce0761fb45fba3819b1894cc808b6
2019-01-23 08:02:11 +01:00
Jani Heikkinen
390a373f28 Remove Qt Canvas3D from qt5.git (Qt 5.13 ->)
Task-number: QTBUG-73015
Change-Id: I52b8d26a2e50b51229c83b532c7a1d5360dc88d7
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2019-01-21 08:02:03 +00:00
Qt Submodule Update Bot
e425b8b65f Update submodules on 'dev' in qt5
Change-Id: I3b69a0cc0aa6ec1395afd043e1810b68ebf9f1f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-17 07:27:21 +00:00
Simo Fält
332ec62ead Fix qtbase LinuxWebAssembly config host
The OpenSUSE 42.3 was replaced with OpenSUSE 15.0.

This amends 89e0159bbc, Swap openSUSE 42.3 to 15.

Task-number: QTQAINFRA-2067
Fixes: QTQAINFRA-2555
Change-Id: I0cd10bcfda5a63fecda0ccdb652b6cc23f349339
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-15 09:31:49 +00:00
Qt Submodule Update Bot
4cc4daa28e Update submodules on 'dev' in qt5
Change-Id: I49e60d4857ca27219862cfac7f2286275fa23a6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-12 07:11:01 +00:00
Qt Submodule Update Bot
8b634155a9 Update submodules on 'dev' in qt5
Change-Id: If053c1ae2aba3aefb28d22b84d992f710e7f0321
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-11 07:40:26 +00:00
Tony Sarajärvi
89e0159bbc Swap openSUSE 42.3 to 15
Task-number: QTQAINFRA-2067
Change-Id: I71f79181704d6ce8faac0019f6d7a5016b0ecb5e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-10 17:39:51 +00:00
Qt Submodule Update Bot
affeefbbe6 Update submodules on 'dev' in qt5
Change-Id: I349c81cfd119703e54c3c7f73601f07f3235bbbe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-10 12:34:56 +00:00
Qt Submodule Update Bot
463a873edd Update submodules on 'dev' in qt5
Change-Id: Iec9fa664e9d99a2c4673a9a8c5a1c6124ad2fcc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-09 08:49:07 +00:00
Qt Submodule Update Bot
6f297420bb Update submodules on 'dev' in qt5
Change-Id: I049658e51a118f46ab46a9e7fa70f6560a8b7982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-08 09:56:32 +00:00
Qt Submodule Update Bot
19a9abeac6 Update submodules on 'dev' in qt5
Change-Id: I47de211a3ba630daafd58fb4e8e1fcff382b4e75
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-07 15:01:44 +00:00
Tony Sarajärvi
6b64780b61 Fix .ci.local to .intra.qt.io in docker provisioning
Change-Id: I9de241e70a5dd15568619da6e4a19d54e76e5a4c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-07 15:01:31 +00:00
Simo Fält
421eb7551b Provisioning: Enable support for printer test
Task-number: QTQAINFRA-992
Change-Id: Ibf13b8df51e72b2885c85af7bb256c73ce5697ed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-01-07 15:01:24 +00:00
Tuomas Heimonen
f7b6a4c276 Add qtsaferenderer extra targets for Coin
The cross-compile targets that qtsaferenderer needs do not exist in qt5
therefore we add those extra targets for CI.

Task-number: QSR-378
Change-Id: Ia07074392b09af8d111a957027407f85518e5d85
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-07 13:28:36 +00:00
Qt Submodule Update Bot
f30e44e9ff Update submodules on 'dev' in qt5
Change-Id: I348d25b8c0a90d8b1bd6ff20e759bcedb05b3f6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-07 05:09:11 +00:00
Qt Submodule Update Bot
677c4d62c5 Update submodules on 'dev' in qt5
Change-Id: I934499413588606f3db7acf499f4f6da59f7941a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-05 08:07:47 +00:00
Qt Submodule Update Bot
f103df4826 Update submodules on 'dev' in qt5
Change-Id: I4eb4a253bbf94463ea2743c81f34ed21df101b35
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-04 19:54:24 +00:00
Qt Submodule Update Bot
7324ace490 Update submodules on 'dev' in qt5
Change-Id: Ie53a57b7b1da333cc5274c2071232f361e8cb2c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-04 09:25:45 +00:00
Frederik Gladhorn
b78812f84e Reduce the number of zypper invocations
Change-Id: Ibb1c76fc4786d19a921c31b0933746f9dfefcde8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 08:03:31 +00:00
Qt Submodule Update Bot
8e7b85af99 Update submodules on 'dev' in qt5
Change-Id: Id3bea223f49d19d801fa5ea880ce42e5312534e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 05:03:28 +00:00
Qt Submodule Update Bot
20b96704ee Update submodules on 'dev' in qt5
Change-Id: I9da113cf7cd79ed9ba04b1a764644c7920951508
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-02 19:48:39 +00:00
Liang Qi
38e2fc6b80 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	.gitmodules
	coin/provisioning/common/linux/docker_testserver.sh
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Done-With: Ryan Chu <ryan.chu@qt.io>
Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
2019-01-02 10:46:49 +01:00
Qt Submodule Update Bot
da65a37041 Update submodules on 'dev' in qt5
Change-Id: I26b5fbbd0279f6321550deaf3425d52dff4d274d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-01 02:31:13 +00:00
Qt Submodule Update Bot
72182d1333 Update submodules on 'dev' in qt5
Change-Id: I2c75b03cc707bf24c5e4e20a908fd5a1348d09b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-27 08:41:22 +00:00
Qt Submodule Update Bot
c245638131 Update submodules on 'dev' in qt5
Change-Id: I63d8b91dec1e0eb4a11b9f8332d2f7dd203abdd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-23 10:15:56 +00:00
Liang Qi
d732383e6b Update submodules on 'dev' in qt5
Change-Id: I3cc13b9baa61251c16cacc1b96a0e0625b4ed751
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-22 03:47:27 +00:00
Alex Blasche
57e432e0da Ensure qtserialport is treated as optional dependency for qtserialbus
Fixes: QTBUG-70360
Change-Id: If4e28c60906787054a607d72a33321eab20a9401
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-12 09:01:28 +00:00
Ryan Chu
959d9bdb67 Docker Provisioning: Install Avahi daemon on Ubuntu
Avahi is a free Zeroconf implementation and provides mDNS service
discovery. It enables Docker containers to publish their services on a
local network. For the host systems supporting mDNS technology, they
will automatically discover the services when running network tests.

However, some of the Linux distributions don't have avahi-daemon
installation by default (e.g. Ubuntu Server 18.04). To not surprise the
user, the provisioning script will help to install avahi-daemon package.

Change-Id: Ibb4c278c552c149b15da8cf7918f7f71ffa3ebec
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:11:01 +00:00
Ryan Chu
a695130478 Assert the provisioning process in macOS if VMX is not enabled
The Docker-machine requires VT-x/AMD-v to build up boot2docker virtual
machine. The VMX flag should be enabled when deploying the VM into
Virtualbox. In the CI framework, it relies on Coin to expose the VMX
flag to the CPU feature. To well handle the case that the VMX could be
removed due to some CI updates, the provisioning script will assert the
process with the related debug message if VMX is not found.

Change-Id: I9f3f123d33629df1655a5b55d776d5361878d1f5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:10:58 +00:00
Ryan Chu
477fc6a73f Docker Provisioning: Remove the obsolete tag of test servers from Ubuntu
The SHA-1 tag of a server image is generated by the shared function
(sha1tree) in testserver_util.sh. The sha1tree function sorts the files
by the their SHA-1 and use the accumulated results as the TAG. So that,
we can assign the same SHA-1 value to a server on all the platforms.

Change-Id: If87ac72f7a9c5cdebef04977480d27b26a701b73
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:10:54 +00:00
Ryan Chu
ce3791a214 Docker Provisioning: Remove the fixed version of package dependencies
Free the dependencies of the specific Ubuntu packages. Ensure that test
server is using the latest version of the Ubuntu packages to test
network changes.

The SHA-1 of the provisioned images in docker cache:
qt-test-server-apache2:537fe302f61851d1663f41495230d8e3554a4a13
qt-test-server-squid:9c32f41b19aca3d778733c4d8fb0ecc5955e893c
qt-test-server-vsftpd:f3a9c8d793a77cc007c0e4e481bec01f9e3eeb7e
qt-test-server-ftp-proxy:d7de8b28392d173db512a558ccc84ead8bece2ae
qt-test-server-danted:35607f9b790524cf9690c7d12a9a401696b7b6b5

Change-Id: I4e6c8cb235f1f798274eb52858e06d8755ae626f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:10:51 +00:00
Liang Qi
bb0a12e410 Update submodules on 'dev' in qt5
Skip qtdeclarative in this round due to QTBUG-72294.

Change-Id: I02dadd44227e8472d2f293d808c6c3eb44f18b66
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-05 20:26:14 +00:00
Liang Qi
d15a5b8841 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I72eb2d8ddca7f536d18956952a0c54f69b2d63f0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-01 01:26:07 +00:00
Jędrzej Nowacki
e8e76d256b Fix handling of structs by clang format
Our coding style expects classes to have opening braces on a new line.
Structs and classes are the same.

Before the patch:
 struct Foo {
    ...
 };

After the patch:
 struct Foo
 {
    ...
 };

Change-Id: Ifab8a402d03ef2fd75b939f39274887feedc7b1b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-11-30 15:50:58 +00:00
Liang Qi
a55b732053 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I40329a2263b6c32046fe867aef55e229574915d2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-23 19:52:35 +00:00
Liang Qi
a4fc60b21c Update submodules on 'dev' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I245a30e6f731dbbbd6400756c161ed402861d43e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-07 07:10:48 +00:00
Simo Fält
5a040ca46a Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template
and moving Android windows platform configs to win10 from win7.

Task-number: QTQAINFRA-1266
Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-11-06 19:30:23 +00:00
Liang Qi
de05c3d5e8 Update submodules on 'dev' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I74b8b9ba8a7a5595acc916db78df25864a23b5f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 19:30:12 +00:00
Ryan Chu
9dc75c3a3d Provisioning: Enable Docker-based test servers to macOS_10.12
Build and provision docker images of test servers into the docker-cache.

Relates to qt/qt5 ea76ace825

Change-Id: I3fbdd7a733669935c64575d50c209da9adf51f42
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-01 08:43:14 +00:00
Qt Submodule Update Bot
4eda836c8c Update submodules on 'dev' in qt5
Change-Id: I8920284e859de42a5c7bc5f3828c36bcd6ba5a98
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-01 06:23:35 +00:00
Heikki Halmet
1f07276692 Provisioning: Remove environment variables from androind-openssl
We shouldn't need those anymore.

Task-number: QTQAINFRA-1266
Change-Id: Ie2161eb1d05cc1af26cbbb1a46525a9a8d7c3a30
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-31 15:47:01 +00:00
Ryan Chu
ea76ace825 Docker Provisioning: Install Docker-based test servers on macOS
Build and cache docker images based on the configurations in testserver.
1. Move the shared Docker files to common/shared/testserver
2. Deploy boot2docker image into VirtualBox via docker-machine commands.
3. Build and tag the docker images by the SHA-1 of server context.

Change-Id: Ic5a588e5cc5e753ec4c4e2e1bc79917bbd03f95d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-10-30 08:15:43 +00:00
Liang Qi
a76e315034 Update submodules on 'dev' in qt5
Change-Id: I1134ae427a2de7bbc08ef000b81e02ded1471bd8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-30 08:15:39 +00:00
Qt Submodule Update Bot
e6e78d4e36 Update submodules on 'dev' in qt5
Change-Id: Icddbe16baf8cff912e131068e73ca772c7520184
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-26 11:49:09 +00:00
Qt Submodule Update Bot
6d23debda8 Update submodules on 'dev' in qt5
Change-Id: I5b4d663b82af33c54a0f93515bd755cb7edec201
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 13:26:33 +00:00
Qt Submodule Update Bot
4480ed8ab8 Update submodules on 'dev' in qt5
Change-Id: Iee06cc029a6322f205b314196fb4a41c52ecbcf3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-22 00:20:07 +00:00
Liang Qi
4a8b97d020 Update submodules on 'dev' in qt5
Change-Id: I617a3480a3bc0fe333fe2ace90f1ee00238c9a98
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-21 09:22:35 +00:00
Liang Qi
16c6fa419a Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I34a18e1ea9ca774638ffe65d08d1fee46efba4aa
2018-10-20 14:17:57 +02:00
Qt Submodule Update Bot
0345ab91fb Update submodules on 'dev' in qt5
Change-Id: If9a481665755ad4758d22d3c2f8438e6c5e0c380
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-18 10:09:35 +00:00
Qt Submodule Update Bot
9597af1ae4 Update submodules on 'dev' in qt5
Change-Id: Ia36224250ccbcc677bfe75c082acf31407acdd51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-16 08:46:15 +00:00
Liang Qi
ad4b13b71c Update submodules on 'dev' in qt5
Change-Id: I9677e735cc06b98c937ad2cd3cd8b00e05f2e3b0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-13 19:23:12 +00:00
Liang Qi
6a650748d3 Update submodules on 'dev' in qt5
Change-Id: Id161e602ba99a8547257f96f5181607af24927d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-10 07:26:53 +00:00
Qt Submodule Update Bot
f06e9ff32b Update submodules on 'dev' in qt5
Change-Id: I9fa852a20f27256bd34029b5a2d5ec2cff1cac5f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-07 19:07:29 +00:00
Liang Qi
9bfa486dd0 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: Ie454d4eff0317cea2fec6870b5ca53f36ad2f191
2018-10-07 12:49:55 +02:00
Qt Submodule Update Bot
4e8b5bae5b Update submodules on 'dev' in qt5
Change-Id: I075115b833822c74887629fdde4f21d5ddc57f72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-01 09:31:24 +00:00
Qt Submodule Update Bot
cc5b03d6ca Update submodules on 'dev' in qt5
Change-Id: Ie1f9ff96a8cabdfa01d4f6d26aedc49d81f8cb3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-30 15:28:43 +00:00
Tony Sarajärvi
5e3511c0c6 Remove Ubuntu 16.04 from the CI
This one also removes the provisioning scripts
for both x64 and x86 envs.

Task-number: QTQAINFRA-2182
Change-Id: I56f109e4600f46a4d11de8d2dbdcdcd08cb896f3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-27 06:49:07 +00:00
Liang Qi
a03ecaa7fd Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I433d7f0d4fd69509acc405b3de3979426dbbc660
2018-09-16 16:39:28 +02:00
Qt Submodule Update Bot
291aa4d366 Update submodules on 'dev' in qt5
Change-Id: I5df6396153e09c7505cb2acb9c8d541c7b8311a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-16 13:30:23 +00:00
Qt Submodule Update Bot
1cfe79db61 Update submodules on 'dev' in qt5
Change-Id: I00ff4d749b6a51a005be8abae10a14fbc3209ed9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-13 05:14:38 +00:00
Qt Submodule Update Bot
fd4e4cceff Update submodules on 'dev' in qt5
Change-Id: Id3bf837247352541b72660b76e2a6dbaa807622f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-09 11:39:40 +00:00
Qt Submodule Update Bot
a54910a07e Update submodules on 'dev' in qt5
Change-Id: I74b5ef2e3e68abf3cdb2e10277b43c00a6c22c52
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-07 02:31:14 +00:00
Qt Submodule Update Bot
8c1b4757fd Update submodules on 'dev' in qt5
Change-Id: If8edd2c5bfd297a6f13710cf5bea250488c862b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-06 21:10:02 +00:00
Liang Qi
a90fb8f83a Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I4e41d54d4b5fe12ca964583b4e7eba484e7b5336
2018-09-06 15:53:41 +02:00
Joni Jäntti
ee9dd0d860 Provisioning: Ubuntu 18.04: Add required packages for b2qt
These packages are required for building b2qt module.

Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-09-06 10:06:01 +00:00
Liang Qi
0be0d5a10c Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: Ica63600c300475dbb7e5357efa7a77f8528de95d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-01 08:26:47 +00:00
Liang Qi
5024bd5725 Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6c3472a0a6c7f1da8e7320cab5cc9b098bd574ba
2018-08-31 16:32:13 +02:00
Liang Qi
90e3bb68e6 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: Ie2d5d427fed014ddb32da17c6b58f5ee2f261ef7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-30 04:52:58 +00:00
Qt Submodule Update Bot
f767b01159 Update submodules on 'dev' in qt5
Change-Id: I55dc0bf5d0107b8a54278e7116aabfb81f45da16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-28 16:30:09 +00:00
Qt Submodule Update Bot
aab459709f Update submodules on 'dev' in qt5
Change-Id: Ie4a7236b6930c030a89f0fcde20b3c87aa3d147d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-26 15:30:25 +00:00
Qt Submodule Update Bot
a11917306e Update submodules on 'dev' in qt5
Change-Id: Ic292d5bbb54f9fb865e8cc6209100342a4cc1952
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-25 19:41:27 +00:00
Liang Qi
7e43cc3c7c Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: If94f226052c35a2400eaeeef450bf75c07367a6e
2018-08-25 00:02:02 +02:00
Qt Submodule Update Bot
5c1c629796 Update submodules on 'dev' in qt5
Change-Id: Iefc67aa6602258a06a35c37cda032e86687b4165
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 20:44:06 +00:00
441 changed files with 7211 additions and 3203 deletions

105
.gitmodules vendored
View File

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

View File

@@ -42,7 +42,7 @@ BraceWrapping:
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterStruct: true
AfterUnion: false
BeforeCatch: false
BeforeElse: false

View File

@@ -1,28 +0,0 @@
Template Target OS Target arch Compiler Target Compiler Features
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples
qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release
qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch
qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release
qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck
qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,175 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-15'
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%'
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
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++'
-
Template: 'qtci-windows-10-x86_64-15'
Target arch: 'x86'
Compiler: 'MSVC2017'
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%'
-
Template: 'qtci-windows-10-x86_64-15'
Target arch: 'x86'
Compiler: 'MSVC2019'
Features: ['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_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%'
-
Template: 'qtci-windows-10-x86_64-15'
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%'
-
Template: 'qtci-windows-10-x86_64-15'
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-15'
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-15'
Compiler: 'MSVC2017'
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%'
-
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2019'
Features: ['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%'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
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 -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['OutOfSourceBuild', 'Documentation']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Compiler: 'ICC_18'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
-
Template: 'qtci-linux-SLES-15-x86_64'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
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 -qt-xcb -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'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -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'
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'IOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'TvOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'WatchOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Target compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -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-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'mips64'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'INTEGRITY_11_04'
Target arch: 'armv7'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc'

View File

@@ -0,0 +1,23 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-14'
Compiler: 'MSVC2017'
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-14'
Compiler: 'MSVC2017'
Target arch: 'x86'
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_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% -static -no-icu'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
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-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

@@ -0,0 +1,40 @@
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET1'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET2'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET3'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET4'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET5'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET6'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET7'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET8'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET9'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET10'

View File

@@ -0,0 +1 @@
qt5.yaml

View File

@@ -0,0 +1,23 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-14'
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-14'
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%'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
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-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

@@ -1,22 +0,0 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1 @@
qt5.yaml

View File

@@ -1,21 +0,0 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,106 @@
-
Template: 'qtci-windows-10-x86_64-15'
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-15'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2017'
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-msvc2017 -xplatform winrt-x86-msvc2017'
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
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++'
-
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
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++'
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2017'
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-msvc2017 -xplatform winrt-arm-msvc2017'
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Compiler: 'MSVC2017'
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-msvc2017 -xplatform winrt-x64-msvc2017'
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Mingw73'
Target compiler: 'Clang'
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'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Target compiler: 'Clang'
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'
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'
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'Mingw73'
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'
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'Mingw73'
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'
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'Mingw73'
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-x86-64-qcc'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'GCC'
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-aarch64le-qcc'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'GCC'
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'
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WebAssembly'
Compiler: 'Mingw73'
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'
Target os: 'WebAssembly'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /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 -xplatform wasm-emscripten'

View File

@@ -1,7 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests
qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo
qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests

View File

@@ -0,0 +1,26 @@
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
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-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
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-15'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten'

View File

@@ -1,3 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo

View File

@@ -0,0 +1,6 @@
-
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'

View File

@@ -1,4 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild

View File

@@ -0,0 +1,24 @@
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
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-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -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 -no-xcb'

View File

@@ -1,3 +0,0 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples

View File

@@ -0,0 +1,14 @@
-
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'Mingw73'
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-10-x86_64-15'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
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 -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

@@ -1,4 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo

View File

@@ -0,0 +1,13 @@
-
Template: 'qtci-windows-10-x86-3'
Compiler: 'MSVC2017'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
-
Template: 'qtci-linux-RHEL-6.6-x86_64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests'
-
Template: 'qtci-windows-8.1-x86'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'

View File

@@ -1,4 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests

View File

@@ -0,0 +1,5 @@
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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++'

View File

@@ -0,0 +1,28 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-14'
Compiler: 'MSVC2017'
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-14'
Compiler: 'MSVC2017'
Target arch: 'x86'
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% -static -no-icu'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
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'
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'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

@@ -1,6 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic

View File

@@ -0,0 +1,14 @@
-
Template: 'qtci-windows-7-x86_64-4'
Compiler: 'MSVC2013'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
-
Template: 'qtci-windows-8.1-x86_64'
Compiler: 'MSVC2013'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
-
Template: 'qtci-windows-10-x86-3'
Compiler: 'MSVC2017'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'

View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.

View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.

View File

@@ -0,0 +1,11 @@
# List about manual pre-installations to Tier1 image:
Vmware tools: installed
Resolution: 1280 X 800
Coin setup (installed boostrap agent, disabled fast boot, disabled firewall (both public and private), disabled UAC, enabled autologin)
Remote Desktop Connection: enabled
Timezone: set to UTC
Administrator tools - services - Windows search: stop & disable
Power settings screen & slee: never
Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"

View File

@@ -0,0 +1,72 @@
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
# thus needing its own version.
Write-Host "Disabling defragmentation"
$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption
if ($version -like '*Windows 7*'){
$pi = New-Object System.Diagnostics.ProcessStartInfo
$pi.FileName = "C:\Windows\System32\schtasks.exe"
$pi.RedirectStandardError = $true
$pi.UseShellExecute = $false
$pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F"
$prog = New-Object System.Diagnostics.Process
$prog.StartInfo = $pi
$prog.Start() | Out-Null
$err = $prog.StandardError.ReadToEnd()
$prog.WaitForExit()
if ($prog.ExitCode -eq 0){
Write-Host "Scheduled defragmentation removed"
} else {
if ($err -like '*cannot find the file*'){
Write-Host "No scheduled defragmentation task found"
exit 0
} else {
Write-Host "Error while deleting scheduled defragmentation task: $err"
}
}
}
else {
try {
$state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State
Write-Host "Scheduled defragmentation task found in state: $state"
}
catch {
Write-Host "No scheduled defragmentation task found"
exit 0
}
Write-Host "Unregistering scheduled defragmentation task"
Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag
Write-Host "Scheduled Defragmentation task was cancelled"
}

View File

@@ -0,0 +1,4 @@
. "$PSScriptRoot\helpers.ps1"
# Disable the NTP from syncing
Run-Executable "w32tm.exe" "/config /syncfromflags:NO"

View File

@@ -0,0 +1,88 @@
. "$PSScriptRoot\helpers.ps1"
# This script will remove unneeded Tasks from Task Scheduler
# Application Experience 'Microsoft Compatibility Appraiser' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program."
DisableSchedulerTask "Application Experience\Microsoft Compatibility Appraiser"
# Application Experience 'ProgramDataUpdater' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program"
DisableSchedulerTask "Application Experience\ProgramDataUpdater"
# Autochk 'Proxy' - "This task collects and uploads autochk SQM data if opted-in to the Microsoft Customer Experience Improvement Program."
DisableSchedulerTask "Autochk\Proxy"
# Chkdsk 'ProactiveScan' - "NTFS Volume Health Scan"
DisableSchedulerTask "Chkdsk\ProactiveScan"
# Chkdsk 'SyspartRepair'
DeleteSchedulerTask "Chkdsk\SyspartRepair"
# Customer Experience Improvement Program 'Consolidator' - "If the user has consented to participate in the Windows Customer Experience Improvement Program, this job collects and sends usage data to Microsoft."
DisableSchedulerTask "Customer Experience Improvement Program\Consolidator"
# Customer Experience Improvement Program 'sbCeip' - "The USB CEIP (Customer Experience Improvement Program) task collects Universal Serial Bus related statistics and information about your machine and sends it to the Windows Device Connectivity engineering group at Microsoft. The information received is used to help improve the reliability, stability, and overall functionality of USB in Windows. If the user has not consented to participate in Windows CEIP, this task does not do anything."
DisableSchedulerTask "Customer Experience Improvement Program\UsbCeip"
# Device Information 'Device'
DisableSchedulerTask "Device Information\Device"
# Diagnosis 'Scheduled' - "The Windows Scheduled Maintenance Task performs periodic maintenance of the computer system by fixing problems automatically or reporting them through Security and Maintenance."
DisableSchedulerTask "Diagnosis\Scheduled"
# DiskDiagnostic 'Microsoft-Windows-DiskDiagnosticDataCollector' - "The Windows Disk Diagnostic reports general disk and system information to Microsoft for users participating in the Customer Experience Program."
DisableSchedulerTask "DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector"
# ExploitGuard 'ExploitGuard MDM policy Refresh' - "Task for applying changes to the machine's Exploit Protection settings."
DisableSchedulerTask "ExploitGuard\ExploitGuard MDM policy Refresh"
# Feedback/Siuf 'DmClient'
DisableSchedulerTask "Feedback\Siuf\DmClient"
# Feedback/Siuf 'DmClient'OnScenarioDownload'
DisableSchedulerTask "Feedback\Siuf\DmClientOnScenarioDownload"
# File Classification Infrastructure 'Property Definition Sync'
DisableSchedulerTask "File Classification Infrastructure\Property Definition Sync"
# InstallService 'ScanForUpdates'
DisableSchedulerTask "InstallService\ScanForUpdates"
# InstallService 'ScanForUpdatesAsUser'
DisableSchedulerTask "InstallService\ScanForUpdatesAsUser"
# LanguageComponentsInstaller 'Installation' - "Install language components that match the user's language list."
DisableSchedulerTask "LanguageComponentsInstaller\Installation"
# LanguageComponentsInstaller 'ReconcileLanguageResources' - "Install language components that match the user's language list."
DisableSchedulerTask "LanguageComponentsInstaller\ReconcileLanguageResources"
# PI 'Secure-Boot-Update' - "This task updates the Secure Boot variables."
DisableSchedulerTask "PI\Secure-Boot-Update"
# PI 'Sqm-Tasks' - "This task gathers information about the Trusted Platform Module (TPM), Secure Boot, and Measured Boot."
DisableSchedulerTask "PI\Sqm-Tasks"
# Power Efficiency Diagnotics 'AnalyzeSystem' - "This task analyzes the system looking for conditions that may cause high energy use."
DisableSchedulerTask "PushToInstall\Registration"
# Servicing 'StartComponentCleanup'
DisableSchedulerTask "Servicing\StartComponentCleanup"
# SettingSync 'BackgroundUploadTask'
DeleteSchedulerTask "SettingSync\BackgroundUploadTask"
# SoftwareProtectionPlatform 'SvcRestartTask' - "This task restarts the Software Protection Platform service at the specified time"
DeleteSchedulerTask "SoftwareProtectionPlatform\SvcRestartTask"
# SoftwareProtectionPlatform 'SvcRestartTaskLogon' - "This task restarts the Software Protection Platform service at the specified time"
DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskLogon"
# SoftwareProtectionPlatform 'SvcRestartTaskNetwork' - "This task restarts the Software Protection Platform service when a new network is detected"
DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork"
# UNP 'RunUpdateNotificationMgr'
DeleteSchedulerTask "UNP\RunUpdateNotificationMgr"

View File

@@ -0,0 +1,16 @@
# Disable UpdateOrchestrator
$name = "UpdateOrchestrator"
$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name"
takeown /F $path /A /R
icacls $path /grant Administrators:F /T
SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE
del "$path\Schedule Scan"
del "$path\Schedule Scan Static Task"
del "$path\Backup Scan"
del "$path\UpdateModelTask"
del "$path\USO_UxBroker"
# Disable Update orchestrator service
reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F

View File

@@ -0,0 +1,59 @@
###########################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# Turning off win defender.
#
# If disabled manually, windows will automatically enable it after
# some period of time. Disabling it speeds up the builds.
. "$PSScriptRoot\helpers.ps1"
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /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"
# Disable WindowsUpdate from Task Scheduler
DisableSchedulerTask "WindowsUpdate\Scheduled Start"

View File

@@ -0,0 +1,4 @@
# Disable Windows File Protection
# Windows File Protection feature in Microsoft Windows prevents programs from replacing critical Windows system files.
reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /V SFCDisable /T REG_dWORD /D 0xffffff9d /F

View File

@@ -0,0 +1,25 @@
# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration.
# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually.
# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system
$limit = (Get-Date).AddMinutes(20)
$path = "C:\Windows\System32\WaaSMedicSvc.dll"
DO {
takeown /F $path
icacls $path /grant Administrators:f
Write-host "Deleting $path"
Try {
del $path
}
Catch [System.UnauthorizedAccessException] {
Write-host "Access to the path '$path' is denied."
Continue
}
if ((Get-Date) -gt $limit) {
exit 1
}
}while (Test-Path -Path "$path")

View File

@@ -0,0 +1,54 @@
############################################################################
##
## 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$
##
#############################################################################
# This script disables the automatic Windows updates
$service = get-service wuauserv
if (-not $service) {
Write-Host "Windows Update service not found."
exit 0
}
if ($service.Status -eq "Stopped") {
Write-Host "Windows Update service already stopped."
} else {
Write-Host "Stopping Windows Update service."
Stop-Service -Name "wuauserv" -Force
}
$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
if ($startup -ne "Disabled") {
set-service wuauserv -startup disabled
} else {
Write-Host "Windows Update service startup already disabled."
}

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -30,29 +30,22 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
# Install Visual Studio $version with $update_version
# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
$version = "2015"
$update_version = "3"
# Visual Studio $version was installed manually using $installer.
$version = "2015 update 3"
$version_number ="14.0.25431.01"
$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978"
# Only way to install specific Visual studio release is to use feed.xml.
# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
# default plus following components were selected:
# * Visual C++
# * 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
$msvc_web_installer = "vs" + $version + "_" + $update_version
$package = "C:\Windows\temp\$msvc_web_installer.exe"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
# 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 "Fetching Visual Studio $version update $update_version..."
Download $url_official $url_cache $package
Verify-Checksum $package $sha1
echo "Installing Visual studio $version update $update_version..."
cmd /c "$package $parameters /norestart /Quiet"
remove-item $package
echo "Visual Studio = $version update $update_version" >> ~\versions.txt
echo "Visual Studio = $version version $version_number" >> ~\versions.txt

View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -31,19 +31,58 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
# This script will install Visual Studio 2017
# Visual Studio $version version $version_number was installed manually using $installer.
$version = "2017"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
$msvcPackage = "C:\Windows\Temp\$version.exe"
# Current version was manually upgraded from the installer
$version_number = "15.9.16"
$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe"
# Following components were selected from installer:
# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack)
# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK)
# Microsoft.Component.NetFX.Native (.NET Native)
# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack)
# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server)
# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references)
# Microsoft.Component.ClickOnce (ClickOnce Publishing)
# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools)
# Microsoft.VisualStudio.Component.NuGet (NuGet package manager)
# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools)
# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation)
# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers)
# Microsoft.Component.MSBuild (MSBuild)
# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools)
# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update)
# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM)
# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64)
# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake)
# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools)
# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools)
# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics)
# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger)
# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic)
# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support)
# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services)
# Component.Linux.CMake (Visual C++ tools for CMake and Linux)
# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features)
# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX)
# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors)
# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK)
# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK)
# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK)
# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64)
# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0))
# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0))
# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0))
# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64])
# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS)
# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++)
# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64])
# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS)
# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++)
# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64])
# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0))
# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0))
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio = $version" >> ~\versions.txt
echo "Visual Studio = $version version version_number" >> ~\versions.txt

View File

@@ -0,0 +1,91 @@
############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# Visual Studio $version version $version_number was installed manually using $installer.
$version = "2019"
# Current version was manually upgraded from the installer
$version_number = "16.3.2"
$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
.NET Framework 4.5 targeting pack
.NET Framework 4.5.1 targeting pack
.NET Framework 4.5.2 targeting pack
.NET Framework 4.6.1 SDK
.NET Framework 4.6.1 targeting pack
.NET Framework 4.6.2 SDK
.NET Framework 4.6.2 targeting pack
.NET Framework 4.7.2 SDK
.NET Framework 4.7.2 targeting pack
.NET Native
.NET Portable Library targeting pack
CLR data typer for SQL Sever
Connectivity and publishing tools
Data sources for SQL Server support
SQL ADAL runtime
SQL Server Command Linne Utilities
SQL Server Data Tools
SQL Server Express 2016 LocalDB
SQL Server ODBC Driver
ClickOnce Publishing
Developer Analytics tools
NuGet package manager
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
MSBuild
MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
.NET profiling tools
C++ profiling tools
JavaScript diagnostics
Just-In-Time debugger
C# and Visual Basic
C++ core features
JavaSript and TypeScript language support
Razor Language Services
Graphics debugger and GPU profiler for DirectX
Image and 3D model editors
C++ ATL for v142 build tools (x86 & x64)
TypeScript 3.3 SDK
Windows 10 SDK (10.0.16299.0)
Windows 10 SDK (10.0.17134.0)
Windows 10 SDK (10.0.17763.0)
Windows 10 SDK (10.0.18362.0)
# NOTE! Work loads were added during installation!
echo "Visual Studio = $version version version_number" >> ~\versions.txt

View File

@@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
toolsVersion="r26.1.1"
toolsFile="sdk-tools-linux-4333796.zip"
ndkVersion="r18b"
ndkVersion="r20"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-28"
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
@@ -80,14 +80,22 @@ else
sudo chown -R qt:users "$targetFolder"
fi
# Run the following command under `eval` or `sh -c` so that the shell properly splits it
sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'"
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
# shellcheck disable=SC2031
if [ "$http_proxy" != "" ]; then
proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
proxy_port=$(echo "$proxy" | cut -d':' -f3)
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \
--no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" \
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
| eval $sdkmanager_no_progress_bar_cmd
else
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
| eval $sdkmanager_no_progress_bar_cmd
fi
echo "Checking the contents of Android SDK..."
@@ -95,6 +103,7 @@ ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
@@ -105,8 +114,11 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
echo "Android NDK = $ndkVersion" >> ~/versions.txt
cd "$sdkTargetFolder/tools/bin"
./sdkmanager --install "emulator"
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
./sdkmanager --install "emulator" \
| eval $sdkmanager_no_progress_bar_cmd
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" \
| eval $sdkmanager_no_progress_bar_cmd
echo "Checking the contents of Android SDK again..."
ls -l "$sdkTargetFolder"

View File

@@ -33,7 +33,7 @@
##
#############################################################################
# This script installs CMake 3.6.2
# This script installs CMake 3.7.2
# CMake is needed for autotests that verify that Qt can be built with CMake
@@ -42,10 +42,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.6.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
version="3.7.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.7.2-Linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
SHA1="915bc981aab354821fb9fd28374a720fdb3aa180"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-Linux-x86_64"

View File

@@ -0,0 +1,19 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQGiBEyvJq8RBAD64FtKbU3VFsZ4PAzcSi9rETc1qXZLVQYtrE38niriIJUuT/tC
kxGjkduD7ozP6rxL+M8fk9UdbbmzhHhXzQT2blyYy2iwpZP5+AFeQawz+oyMRVze
x6IY5qO31TiRu+aEBptk6nco4DULlKABlvtjKI+gJ4buJm+TumyrPaxe9wCgpFwl
O0fEjpOfQd+6Du0sCnPX7+8D/3xYVj9q5ILmrJ9zehBKjRYEcaP0rZVqudH51FUS
I0LQNHsJdzKLzhT+Zj7TJU4KnCN4sX7amfYL3GT9qyZEBDx2alubvEsI36wtNq0i
ewU4XmyZ+Rd7Q4mAPNoBGe5DsUA8wn/7iHGg9aJHu+GXvH7T3DVoUxW5W2KqPw+h
jzqGBACWGuuCefa683uf6aKqpTS3JB+01BDPf+sG9qJ+k7xcJOsEiXIe1X5vH9ov
kEvTM12kzY7SGwlsFsTDT1xioDl62g5nPlZMXErUBVnjoMtjl9bDwUPJY/vP1S9M
VaONBMoJEON3HRui9jhdEK25LTdrcFlFpRzJI3AgdXwy8aQyiLRGZGV2ZWw6bGFu
Z3VhZ2VzOmdvIE9CUyBQcm9qZWN0IDxkZXZlbDpsYW5ndWFnZXM6Z29AYnVpbGQu
b3BlbnN1c2Uub3JnPohmBBMRAgAmBQJc9DoCAhsDBQkUY8NTBgsJCAcDAgQVAggD
BBYCAwECHgECF4AACgkQr0z+TTB9e/lQZgCfXIjj30HyCPvUbSbSd6zOS0seAegA
n3DXayMpRphNmyJgLvl5qKfsX7f6iEYEExECAAYFAkyvJq8ACgkQOzARt2udZSOg
qQCeOba7kjk7CI+64GOkhhTGSdjnjdQAn2IC5tx+PW38XKwl3Jr5YVp0RyR0
=AOj6
-----END PGP PUBLIC KEY BLOCK-----

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
sudo gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false
sudo gsettings set org.gnome.desktop.notifications show-banners false
gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false
gsettings set org.gnome.desktop.notifications show-banners false

View File

@@ -39,6 +39,10 @@ echo "Disable Network Time Protocol (NTP)"
if uname -a |grep -q "Ubuntu"; then
sudo timedatectl set-ntp false
elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
(sudo systemctl stop chronyd && sudo systemctl disable chronyd)
elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
sudo timedatectl set-ntp false
else
(systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off
sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
fi

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,11 +42,15 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun
sudo apt-get update
sudo apt-get install docker-ce -y
sudo usermod -a -G docker $USER
sudo docker info
sudo docker --version
# Download and install the docker-compose extension.
sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
sudo docker-compose --version
# Install Avahi to discover Docker containers in the test network
sudo apt-get install avahi-daemon -y
# Start testserver provisioning
source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh"
sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh"

View File

@@ -37,6 +37,8 @@
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -ex
@@ -81,7 +83,7 @@ function InstallGCC() {
sudo make install
rm -rf "$targetFile"
rm -rf "$tmpFolder/gcc-$version"
sudo rm -rf "$tmpFolder/gcc-$version"
fi
# openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
@@ -97,6 +99,9 @@ function InstallGCC() {
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
fi
echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf
echo "/usr/local/lib32" | sudo tee -a /etc/ld.so.conf.d/gcc-libraries.conf
sudo ldconfig -v
echo "GCC = $version" >> ~/versions.txt
}

View File

@@ -35,32 +35,38 @@
# This script install OpenSSL from sources.
# Requires GCC and Perl to be in PATH.
set -ex
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.0.2p"
exports_file="/tmp/export.sh"
# source previously made environmental variables.
if uname -a |grep -q "Ubuntu"; then
# shellcheck disable=SC1090
grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
rm -rf "$exports_file"
else
# shellcheck disable=SC1090
grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
rm -rf "$exports_file"
fi
version="1.1.1d"
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
targetFile="/tmp/openssl-$version.tar.gz"
installFolder="/home/qt/"
sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
# Until every VM doing Linux Android builds have provisioned the env variable
# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
# QTQAINFRA-1436
opensslHome="${installFolder}openssl-1.0.2"
sha="056057782325134b76d1931c48f2c7e6595d7ef4"
opensslHome="${HOME}/openssl/android/openssl-${version}"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
mkdir -p "${HOME}/openssl/android/"
tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
tar -xzf "$targetFile" -C "$installFolder"
# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
mv "${opensslHome}p" "${opensslHome}"
pushd "$opensslHome"
echo "Running configure"
perl Configure shared android
TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
cd "$opensslHome"
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"

View File

@@ -49,7 +49,7 @@ echo "$sha1 $targetFile" | sha1sum --check
if [ ! -d "$targetFolder" ]; then
mkdir -p $targetFolder
fi
sudo tar -C $targetFolder -xvzf $targetFile
sudo tar -C $targetFolder -xzf $targetFile
sudo chown -R qt:users "$targetFolder"/"$folderName"
# Verify that we have last file in tar

View File

@@ -41,8 +41,8 @@ set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz"
sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz"
sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621"
folderName="qnx700"
targetFile="qnx700.tar.xz"
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"

View File

@@ -1,3 +1,3 @@
#!/usr/bin/env bash
sudo apt -q -y remove update-notifier update-manager
sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core

View File

@@ -0,0 +1,47 @@
[global_tags]
[agent]
interval = "10s"
round_interval = true
metric_batch_size = 100
metric_buffer_limit = 10000
collection_jitter = "0s"
flush_interval = "10s"
flush_jitter = "5s"
precision = ""
logfile = "/var/log/telegraf-coin.log"
hostname = "$COIN_UNIQUE_JOB_ID"
omit_hostname = false
[[outputs.influxdb]]
urls= ["https://qtinfluxdb01.intra.qt.io:8086"]
insecure_skip_verify = true
database = "coin_vms"
skip_database_creation = true
username = "coin_vms_writer"
password = "COIN_VMS_WRITER_PASS"
[[inputs.cpu]]
percpu = true
totalcpu = true
collect_cpu_time = false
report_active = false
[[inputs.disk]]
ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"]
[[inputs.diskio]]
[[inputs.kernel]]
[[inputs.mem]]
[[inputs.processes]]
[[inputs.swap]]
[[inputs.system]]
[[inputs.kernel_vmstat]] # linux-only
[[inputs.netstat]]
# Monitor Coin process
[[inputs.procstat]]
exe = "coin-"
pid_finder = "native"
# Monitor I/O latency
[[inputs.exec]]
data_format = "influx"
commands = [ "/usr/bin/telegraf-ioping.sh /" ]

View File

@@ -1,3 +1,12 @@
#!/usr/bin/env bash
# Will install homebrew package manager for macOS
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null
# Will install homebrew package manager for macOS.
# WARNING: Requires commandlinetools
# TODO audit and cache this file locally, see QTQAINFRA-3134
curl -L -o /tmp/homebrew_install https://raw.githubusercontent.com/Homebrew/install/master/install
/usr/bin/ruby /tmp/homebrew_install </dev/null
brew update

View File

@@ -0,0 +1,70 @@
#!/bin/sh
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# Increase the soft and hard RLIMIT_NOFILE and RLIMIT_NPROC limits.
# By default they are 256/unlimited and 709/1064
# and they sometimes create problems to the build process and telegraf.
set -e
PROVISIONING_DIR="$(dirname "$0")/../../"
. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
echo "Current limits are:"
ulimit -a
launchctl limit
$CMD_INSTALL -m 644 -o root -g wheel \
$PROVISIONING_DIR/common/macos/limit.maxfiles.plist \
$PROVISIONING_DIR/common/macos/limit.maxproc.plist \
/Library/LaunchDaemons/
# Activate the new limits immediately (not for the current session though)
sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
sudo launchctl load -w /Library/LaunchDaemons/limit.maxproc.plist
echo "After adjusting, limits are:"
ulimit -a
launchctl limit
# NOTE: If the limits are not increased enough, it might be because of
# restrictions set by the kernel. They can be temporarily altered with:
# sudo sysctl -w kern.maxproc=xxxx
# sudo sysctl -w kern.maxprocperuid=xxx

View File

@@ -50,7 +50,7 @@ function InstallCommandLineTools {
hdiutil attach "/tmp/$packageName"
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
sudo installer -verbose -pkg ./*.pkg -target /
sudo installer -pkg ./*.pkg -target / -allowUntrusted
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3

View File

@@ -1,81 +0,0 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script install OpenSSL
set -ex
# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
opensslVersion="1.0.2p"
opensslFile="openssl-$opensslVersion.tar.gz"
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
# Below target location has been hard coded into Coin.
# QTQAINFRA-1195
openssl_install_dir=/usr/local/openssl-$opensslVersion
opensslTargetLocation="/usr/local/opt/openssl"
InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
cd "/tmp/openssl-$opensslVersion"
pwd
sudo ./config --prefix=$openssl_install_dir
echo "Running 'make' for OpenSSL"
sudo make --silent > /tmp/openssl_make.log 2>&1
echo "Running 'make install' for OpenSSL"
sudo make --silent install > /tmp/openssl_make_install.log 2>&1
path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
sudo mkdir -p "$path"
sudo ln -s $openssl_install_dir $opensslTargetLocation
SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
sudo rm -rf /tmp/openssl-$opensslVersion
echo "OpenSSL = $opensslVersion" >> ~/versions.txt

View File

@@ -0,0 +1,23 @@
class Libiodbc < Formula
desc "Database connectivity layer based on ODBC. (alternative to unixodbc)"
homepage "http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/"
url "https://github.com/openlink/iODBC/archive/v3.52.12.tar.gz"
sha256 "b2cab4f8fbd5388344d7ee0deb1a32310795b1e631c3505a5b515d90186e2516"
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
conflicts_with "unixodbc", :because => "both install 'odbcinst.h' header"
def install
system "./autogen.sh"
system "./configure", "--prefix=#{prefix}"
system "make", "install"
end
test do
system bin/"iodbc-config", "--version"
end
end

View File

@@ -40,8 +40,7 @@ set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
brew update
brew install libiodbc
brew install ${BASH_SOURCE%/*}/libiodbc.rb
# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>limit.maxfiles</string>
<key>ProgramArguments</key>
<array>
<string>launchctl</string>
<string>limit</string>
<string>maxfiles</string>
<string>65536</string>
<string>524288</string>
</array>
<key>RunAtLoad</key>
<true/>
<key>ServiceIPC</key>
<false/>
</dict>
</plist>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>limit.maxproc</string>
<key>ProgramArguments</key>
<array>
<string>launchctl</string>
<string>limit</string>
<string>maxproc</string>
<string>8192</string>
<string>32768</string>
</array>
<key>RunAtLoad</key>
<true/>
<key>ServiceIPC</key>
<false/>
</dict>
</plist>

View File

@@ -0,0 +1,53 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2016 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$
##
#############################################################################
# This script needs to be called last during provisioning so that the software information will show up last in provision log.
set -ex
# Print all build machines versions to provision log
echo "*********************************************" >> ~/versions.txt
echo "***** macOS version *****" >> ~/versions.txt
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
"$(dirname "$0")/version.sh"

View File

@@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg"
SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg"
SHA1="895a8327a58e7c0e58852638ab3d84843643535b"
DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
@@ -55,5 +55,5 @@ InstallPip python2.7
SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
echo "python2 = 2.7.14" >> ~/versions.txt
echo "python2 = 2.7.16" >> ~/versions.txt

View File

@@ -0,0 +1,51 @@
[global_tags]
[agent]
interval = "10s"
round_interval = true
metric_batch_size = 100
metric_buffer_limit = 10000
collection_jitter = "0s"
flush_interval = "10s"
flush_jitter = "5s"
precision = ""
logfile = "/var/log/telegraf-coin.log"
hostname = "$COIN_UNIQUE_JOB_ID"
omit_hostname = false
[[outputs.influxdb]]
urls= ["https://qtinfluxdb01.intra.qt.io:8086"]
insecure_skip_verify = true
database = "coin_vms"
skip_database_creation = true
username = "coin_vms_writer"
password = "COIN_VMS_WRITER_PASS"
#[[inputs.cpu]] # linux-only
# percpu = true
# totalcpu = true
# collect_cpu_time = false
# report_active = false
[[inputs.disk]]
ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"]
#[[inputs.diskio]] # linux-only
[[inputs.kernel]]
[[inputs.mem]]
[[inputs.processes]]
[[inputs.swap]]
[[inputs.system]]
#[[inputs.kernel_vmstat]] # linux-only
[[inputs.netstat]]
# Monitor Coin process
[[inputs.procstat]]
exe = "coin-"
# Buggy on macOS if using the "native" pid_finder, see:
# https://github.com/influxdata/telegraf/issues/6265
# Tested 1.12.1 version that "native" pid_finder has been fixed,
# but it is slow and times out frequently
pid_finder = "pgrep"
# Monitor I/O latency
[[inputs.exec]]
data_format = "influx"
commands = [ "/usr/bin/telegraf-ioping.sh /" ]

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,14 +33,11 @@
##
#############################################################################
set -ex
# This script will print all installed software to provision log.
# Script needs to be named so that it will be ran at last during provisioning
# shellcheck source=../common/unix/check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
# shellcheck disable=SC2031
if [ "$http_proxy" != "" ]; then
echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
fi
sudo yum update -y nss curl
# Print all build machines versions to provision log
echo "*********************************************"
echo "***** SW VERSIONS *****"
cat ~/versions.txt
echo "*********************************************"

View File

@@ -13,7 +13,7 @@ Jinja2==2.10
MarkupSafe==1.0
path.py==11.0.1
pathtools==0.1.2
PyYAML==3.13
PyYAML==5.1
six==1.11.0
typing==3.6.4
watchdog==0.8.3

View File

@@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
mQINBFYJmwQBEADCw7mob8Vzk+DmkYyiv0dTU/xgoSlp4SQwrTzat8MB8jxmx60l
QjmhqEyuB8ho4zzZF9KV+gJWrG6Rj4t69JMTJWM7jFz+0B1PC7kJfNM+VcBmkTnj
fP+KJjqz50ETnsF0kQTG++UJeRYjG1dDK0JQNQJAM6NQpIWJI339lcDf15vzrMnb
OgIlNxV6j1ZZqkle4fvScF1NQxYScRiL+sRgVx92SI4SyD/xZnVGD/szB+4OCzah
+0Q/MnNGV6TtN0RiCDZjIUYiHoeT9iQXEONKf7T62T4zUafO734HyqGvht93MLVU
GQAeuyx0ikGsULfOsJfBmb3XJS9u+16v7oPFt5WIbeyyNuhUu0ocK/PKt5sPYR4u
ouPq6Ls3RY3BGCH9DpokcYsdalo51NMrMdnYwdkeq9MEpsEKrKIN5ke7fk4weamJ
BiLI/bTcfM7Fy5r4ghdI9Ksw/ULXLm4GNabkIOSfT7UjTzcBDOvWfKRBLX4qvsx4
YzA5kR+nX85u6I7W10aSqBiaLqk6vCj0QmBmCjlSeYqNQqSzH/6OoL6FZ7lP6AiG
F2NyGveJKjugoXlreLEhOYp20F81PNwlRBCAlMC2Q9mpcFu0dtAriVoG4gVDdYn5
t+BiGfD2rJlCinYLgYBDpTPcdRT3VKHWqL9fcC4HKmic0mwWg9homx550wARAQAB
tDFJbmZsdXhEQiBQYWNrYWdpbmcgU2VydmljZSA8c3VwcG9ydEBpbmZsdXhkYi5j
b20+iQI3BBMBCgAhBQJWCZsEAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJ
EGhKFM8lguDF9XEQAK9rREnZt6ujh7GXfeNki35bkn39q8GYh0mouShFbFY9o0i3
UJVChsxokJSRPgFh9GOhOPTupl3rzfdpD+IlWI2Myt6han2HOjZKNZ4RGNrYJ5UR
uxt4dKMWlMbpkzL56bhHlx97RoXKv2d2zRQfw9nyZb6t3lw2k2kKXsMxjGa0agM+
2SropwYOXdtkz8UWaGd3LYxwEvW3AuhI8EEEHdLetQaYe9sANDvUEofgFbdsuICH
9QLmbYavk7wyGTPBKfPBbeyTxwW2rMUnFCNccMKLm1i5NpZYineBtQbX2cfx9Xsk
1JLOzEBmNal53H2ob0kjev6ufzOD3s8hLu4KMCivbIz4YT3fZyeExn0/0lUtsQ56
5fCxE983+ygDzKsCnfdXqm3GgjaI90OkNr1y4gWbcd5hicVDv5fD3TD9f0GbpDVw
yDz8YmvNzxMILt5Glisr6aH7gLG/u8jxy0D8YcBiyv5kfY4vMI2yXHpGg1cn/sVu
ZB01sU09VVIM2BznnimyAayI430wquxkZCyMx//BqFM1qetIgk1wDZTlFd0n6qtA
fDmXAC4s5pM5rfM5V57WmPaIqnRIaESJ35tFUFlCHfkfl/N/ribGVDg1z2KDW08r
96oEiIIiV4GfXl+NprJqpNS3Cn+aCXtd7/TsDScDEgs4sMaR29Lsf26cuWk8uQIN
BFYJmwQBEADDPi3fmwn6iwkiDcH2E2V31cHlBw9OdJfxKVUdyAQEhTtqmG9P8XFZ
ERRQF155XLQPLvRlUlq7vEYSROn5J6BAnsjdjsH9LmFMOEV8CIRCRIDePG/Mez2d
nIK5yiU6GkS3IFaQg2T9/tOBKxm0ZJPfqTXbT4jFSfvYJ3oUqc+AyYxtb8gj1GRk
X283/86/bA3C98u7re1vPtiDRyM8r0+lhEc59Yx/EAOL+X2gZyTgyUoH+LLuOWQK
s1egI8y80R8NZfM1nMiQk2ywMsTFwQjSVimScvzqv5Nt8k8CvHUQ3a6R+6doXGNX
5RnUqn9Qvmh0JY5sNgFsoaGbuk2PJrVaGBRnfnjaDqAlZpDhwkWhcCcguNhRbRHp
N7/a0pQr70bAG9VikzLyGC17EU0sxney/hyNHkr4Uyy2OXHpuJvRjVKy/BwZ3fxA
AYX2oZIOxQB3/OulzO/DppaCVhRtp1bt+Z5f+fpisiVb5DvZcMdeyAoQ4+oOr7v3
EasIs2XYcQ+kOE3Y2kdlHWBeuXzxgWgJZ1OOpwGMjR3Uy6IwhuSWtreJBA4er+Df
vgSPwKBsRLNLbPe3ftjArnC5GfMiGgikVdAUdN4OkEqvUbkRoAVGKTOMLUKm+ZkG
OskJOVYS+JAina0qkYEFF7haycMjf9olhqLmTIC+6X7Ox9R2plaOhQARAQABiQIf
BBgBCgAJBQJWCZsEAhsMAAoJEGhKFM8lguDF8ZIP/1q9Sdz8oMvf9AJXZ7AYxm77
V+kJzJqi62nZLWJnrFXDZJpU+LkYlb3fstsZ1rvBhnrEPSmFxoj72CP0RtcyX7wJ
dA7K1Fl9LpJi5H8300cC7UyG94MUYbrXijbLTbnFTfNr1tGx4a1T/7Yyxx/wZGrT
H/X8cvNybkl33SxDdlQQ9kx3lFOwC41e3TkGsUWxn3TCfvDh8VdA6Py6JeSPFGOb
MEO2/q7oUgvjfV+ivN5ayZi9bWgeqm1sgtmTHHQ4RqwwKrAb5ynXpn1b9QrkevgT
b91uzMA22Prl4DuzKiaMYDcZOQ3vtf0eFBP0GOSSgUKS4bQ3dGgi1JmQ7VuAM4uj
+Ug5TnGoLwclTwLksc7v89C5MMPgm2vVXvCUDzyzQA7bIHFeX+Rziby4nymec4Nr
eeXYNBJWrEp8XR7UNWmEgroXRoN1x9/6esh5pnoUXGAIWuKzSLQM70/wWxS67+v2
aC1GNb+pXXAzYeIIiyLWaZwCSr8sWMvshFT9REk2+lnb6sAeJswQtfTUWI00mVqZ
dvI3Wys2h0IyIejuwetTUvGhr9VgpqiLLfGzGlt/y2sg27wdHzSJbMh0VrVAK26/
BlvEwWDCFT0ZJUMG9Lvre25DD0ycbougLsRYjzmGb/3k3UktS3XTCxyBa/k3TPw3
vqIHrEqk446nGPDqJPS5
=9iF7
-----END PGP PUBLIC KEY BLOCK-----

View File

@@ -0,0 +1,26 @@
#!/bin/sh
# Measure I/O latency once, return data in InfluxDB format
#
# Run one ioping command for read, and one for write.
# Each one sends 3 requests and reports the minimum time, in nanoseconds.
# (Because of limitations of ioping, we can't just send one request and get
# the number back in the batch format. Additionally, the number seems to be
# fluctuating quite a bit so taking the smallest number out of 3 requests is
# stabilising it a bit.)
set -e
[ x"$1" = x ] && echo "$0 takes a path as a first argument" && exit 1
# Try to run in high priority to avoid slow-downs because of
# factors other than I/O.
renice -n -10 -p $$ >/dev/null 2>&1 || true
rlatency="$(ioping -B -k -c 3 -i 0.1 "$1" | cut -d " " -f 5)"
wlatency="$(ioping -B -k -c 3 -i 0.1 -W "$1" | cut -d " " -f 5)"
printf "ioping,path=$1 read_latency_ns=%u,write_latency_ns=%u\n" \
$rlatency $wlatency

View File

@@ -0,0 +1,6 @@
https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_i386.zip d2dea67a28fd7a9e21395d14f0b7ce1b6413e85cc9ffd89cc7ff8f35e8af5837
https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_amd64.zip 88d8c8146b561f43726e61688b42d0b5ab88fc22607b94df5a2c8245bbb27e29
https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_darwin_amd64.tar.gz 58a2b294c1b6408c396b5526719cf7cad557f7075fed10ff0b2a74141ea2d629
https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_amd64.tar.gz 070a76800d1a5f33413b8948286f75caa55ebd924f6fb6996a753b9979799ef5
https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_i386.tar.gz 964077b6846708f579a100d7ea6090e2d8350ace75ec735d539bc452bc551038
https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1-static_linux_amd64.tar.gz bb03814c99c037ce0758e3884660910f2f6fd78f3d49a8e1ef531693b3cfe25d

View File

@@ -0,0 +1 @@
* text eol=lf

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="apache2 libcgi-session-perl avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 80 443

View File

@@ -0,0 +1,15 @@
FROM ubuntu:18.04
RUN apt-get update && apt-get -y install git maven default-jdk avahi-daemon
RUN mkdir -p /root/src/
# Get californium-based CoAP test server
WORKDIR /root/src
RUN git clone https://github.com/selart/californium.git
WORKDIR /root/src/californium
RUN mvn clean install -q -DskipTests
WORKDIR /
EXPOSE 5683/udp 5684/udp

View File

@@ -0,0 +1,4 @@
FROM ubuntu:16.04
ARG packages="cyrus-imapd avahi-daemon"
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages
EXPOSE 143 993

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="cyrus-imapd avahi-daemon"
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages
EXPOSE 143 993

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="dante-server avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 1080-1081

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -35,35 +35,34 @@
set -ex
[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]}
case $FILE in
*/*) SERVER_PATH="${FILE%/*}" ;;
*) SERVER_PATH="." ;;
esac
# Sort files by their SHA-1, and then return the accumulated result
sha1tree () {
# For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead.
[ -x "$(command -v sha1sum)" ] || SHASUM=shasum
find "$@" -type f -print0 | \
xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \
sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1
}
# Using SHA-1 of each server context as the tag of docker images. A tag labels a
# specific image version. It is used by docker compose file (docker-compose.yml)
# to launch the corresponding docker containers. If one of the server contexts
# (./apache2, ./danted, ...) gets changes, all the related compose files in
# qtbase should be updated as well.
#
# For example, here's how to get the SHA-1 of apache test server.
# find ./apache2 -type f -print0 | sort -z | xargs -r0 sha1sum | \
# awk '{ print $1 }' | sha1sum | awk '{ print $1 }'
testserver='apache2 squid vsftpd ftp-proxy danted'
source "$SERVER_PATH/settings.sh"
for server in $testserver
do
context="${BASH_SOURCE%/*}/$server"
sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \
sha1sum | awk '{ print $1 }')
sudo docker build -t qt-test-server-$server:$sha1 $context
# transition - The fixed tag is temporarily used by CI to pass the qtbase testing.
case $server in
apache2) fixed_tag="cc9ea678b92bdda33acb9fa0159bb4ad0f3cd947" ;;
squid) fixed_tag="577d99307eea9a8cccfec944d25be2bce2fe99cc" ;;
vsftpd) fixed_tag="18896604c7e90b543e56d80c8a8aabdb65a590d0" ;;
ftp-proxy) fixed_tag="2c6c8f1ab6a364b540c43d705fb6f15a585cb2af" ;;
danted) fixed_tag="327dd56c3c35db85b26fac93213a5a1918475bc7" ;;
esac
[ -z "$fixed_tag" ] || \
sudo docker tag qt-test-server-$server:$sha1 qt-test-server-$server:$fixed_tag
context="$SERVER_PATH/$server"
docker build -t qt-test-server-$server:$(sha1tree $context) $context
done
sudo docker images
docker images

View File

@@ -0,0 +1,53 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
set -ex
TestMachine='qt-test-server'
# Deploy docker virtual machine (Boot2Docker) into VirtualBox only if it doesn't exist
if [ -z $(docker-machine ls -q --filter "name=$TestMachine") ]
then
docker-machine create $@ $TestMachine
docker-machine ip $TestMachine
else
# Otherwise, start the docker machine and update with new TLS certificates.
docker-machine start $TestMachine && docker-machine regenerate-certs -f $TestMachine
fi
# Switch the docker engine to $TestMachine
eval $(docker-machine env $TestMachine)
docker-machine ls

View File

@@ -0,0 +1,57 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
set -ex
[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]}
case $FILE in
*/*) SERVER_PATH="${FILE%/*}" ;;
*) SERVER_PATH="." ;;
esac
# Create docker virtual machine (Boot2docker)
case $1 in
VMX) source "$SERVER_PATH/docker_machine.sh" "-d virtualbox" ;;
Hyper-V)
# The Hyper-v has been enabled in Windows 10. Disable checking the hardware virtualization.
source "$SERVER_PATH/docker_machine.sh" "-d virtualbox --virtualbox-no-vtx-check" ;;
*) ;;
esac
# Display system-wide information of docker-engine
docker info
# Create images
$SERVER_PATH/docker_images.sh

View File

@@ -0,0 +1,4 @@
FROM ubuntu:16.04
ARG packages="xinetd avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 7 7/UDP 13

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="xinetd avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 7 7/UDP 13

View File

@@ -0,0 +1,20 @@
FROM ubuntu:18.04
RUN apt-get update && apt-get -y install git avahi-daemon autoconf automake libtool make libgnutls28-dev
RUN mkdir -p /root/src/
# Get FreeCoAP test server
WORKDIR /root/src
RUN git clone https://github.com/keith-cullen/FreeCoAP.git
WORKDIR /root/src/FreeCoAP
RUN autoreconf --install
RUN ./configure
RUN make
RUN make install
WORKDIR /root/src/FreeCoAP/sample/time_server
RUN make
WORKDIR /
EXPOSE 5685/udp

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="ftp-proxy avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 2121

View File

@@ -0,0 +1,4 @@
FROM ubuntu:16.04
ARG packages="iptables avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 1357

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="iptables avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 1357

View File

@@ -1,8 +1,6 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -35,9 +33,6 @@
set -ex
# refresh local certificates
sudo subscription-manager refresh
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
sudo subscription-manager attach --auto
# A list of test servers to be provisioned
testserver='apache2 squid vsftpd ftp-proxy danted echo cyrus iptables californium freecoap'
testserver="$testserver apache2_18.04 squid_18.04 vsftpd_18.04 ftp-proxy_18.04 danted_18.04 echo_18.04 cyrus_18.04 iptables_18.04"

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="squid avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 3128-3130

View File

@@ -0,0 +1,4 @@
FROM ubuntu:18.04
ARG packages="vsftpd avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 20-21

View File

@@ -1,8 +1,8 @@
#!/usr/bin/env bash
#!/bin/sh
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,31 +33,78 @@
##
#############################################################################
# A helper script used for downloading a file from a URL or an alternative
# URL. Also the SHA1 is checked for the file. Target filename should also
# be given.
#
# If called directly from another script, it will exit the parent script
# as well, if not called in its own subshell with parentheses.
# URL. Also the SHA is checked for the file (SHA algorithm is autodetected
# based on the SHA length). Target filename should also be given.
set -ex
############################ BOILERPLATE ###############################
command -v sha1sum >/dev/null || alias sha1sum='shasum -a 1'
command -v sha256sum >/dev/null || alias sha256sum='shasum -a 256'
command -v sha384sum >/dev/null || alias sha384sum='shasum -a 384'
command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512'
########################################################################
function DownloadURL {
url=$1
url_alt=$2
expectedSha1=$3
targetFile=$4
echo "Downloading from primary URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || {
echo "Failed to download '$url' multiple times"
echo "Downloading from alternative URL '$url_alt'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; }
}
Download () {
url="$1"
targetFile="$2"
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
sha1sum --check "$targetFile.sha1"
rm -f "$targetFile.sha1"
command -v curl >/dev/null \
&& curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" \
|| wget --tries 5 -O "$targetFile" "$url"
}
VerifyHash () {
file=$1
expectedHash=$2
if [ ! -f "$file" ]
then return 2 # file does not exist
fi
hashLength="$(echo "$expectedHash" | wc -c | sed 's/ *//g')"
# Use backticks because of bug with bash-3 (default on macOS),
# caused when there are unbalanced parentheses inside $()
# shellcheck disable=SC2006
hash=`case "$hashLength" in
41) sha1sum "$file" ;;
65) sha256sum "$file" ;;
97) sha384sum "$file" ;;
129) sha512sum "$file" ;;
*) echo "FATAL! Unknown hash length: $hashLength" 1>&2 && exit 1 ;;
esac | cut -d ' ' -f 1`
if [ ! "$expectedHash" = "$hash" ]
then
echo "FAIL! wrong file hash: $file $hash" 1>&2
return 1
fi
echo "OK verified integrity of: $file"
}
# Check if file already exists and is good, otherwise download it
DownloadURL () {
url=$1
url2=$2
expectedHash=$3
targetFile=$4
if VerifyHash "$targetFile" "$expectedHash"
then
echo "Skipping download, found and validated existing file: $targetFile"
else
echo "Downloading from primary URL: $url"
if ! Download "$url" "$targetFile"
then
echo "FAIL! to download, trying alternative URL: $url2" 1>&2
if ! Download "$url2" "$targetFile"
then
echo 'FAIL! to download even from alternative URL' 1>&2
return 1
fi
fi
VerifyHash "$targetFile" "$expectedHash"
fi
}

View File

@@ -0,0 +1,159 @@
#!/bin/sh
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# Script to be sourced from everywhere you need a common environment. Defines:
export PROVISIONING_DIR
export PROVISIONING_OS
export PROVISIONING_OS_ID
export PROVISIONING_ARCH
export CMD_PKG_INSTALL
export CMD_PKG_LOCALINSTALL
export CMD_INSTALL
if [ x"$IS_PROVISIONING_COMMON_SOURCED" != x ]
then
echo "common.sourced.sh has already been sourced, re-sourcing skipped"
return
fi
# Do not export; you want children to re-source, because they only inherit the
# variables but not the functions
IS_PROVISIONING_COMMON_SOURCED=1
fatal () {
echo "$1" 1>&2
if [ x"$2" != x ]
then exit "$2"
else exit
fi
}
# Takes one argument which should be the filename of this script. Returns true
# if the script is being sourced, false if the script is being executed.
is_script_executed () {
[ x"$(basename $(echo "$0" | sed s/^-//))" = x"$1" ]
}
is_script_executed common.sourced.sh \
&& fatal "Script common.sourced.sh should always be sourced, not executed"
_detect_linux_OS_ID () {
if [ -f /etc/os-release ]
then
. /etc/os-release
PROVISIONING_OS_ID="$ID"
elif [ -f /etc/redhat-release ]
then
case "$(cat /etc/redhat-release)" in
"Red Hat Enterprise Linux"*)
PROVISIONING_OS_ID="rhel"
;;
"CentOS Linux"*)
PROVISIONING_OS_ID="centos"
;;
*) fatal "Unknown string in /etc/redhat-release" ;;
esac
fi
}
set_common_environment () {
# Unfortunately we can't find the provisioning directory from a sourced
# script in a portable way
# PROVISIONING_DIR="$(dirname "$0")/../../"
[ x"$PROVISIONING_DIR" = x ] \
&& fatal "PROVISIONING_DIR variable needs to be set before calling set_common_environment"
uname_s="$(uname -s)"
case "$uname_s" in
Linux)
PROVISIONING_OS=linux
_detect_linux_OS_ID
case "$PROVISIONING_OS_ID" in
suse|sles|opensuse*)
CMD_PKG_INSTALL="sudo zypper -nq install"
CMD_PKG_LOCALINSTALL="sudo zypper --no-gpg-checks -nq install"
;;
debian|ubuntu)
CMD_PKG_INSTALL="sudo apt -y install"
CMD_PKG_LOCALINSTALL="sudo apt -y install"
;;
rhel|centos|fedora)
CMD_PKG_INSTALL="sudo yum -y install"
CMD_PKG_LOCALINSTALL="sudo yum -y --nogpgcheck localinstall"
;;
*) fatal "Unknown ID in /etc/os-release: $PROVISIONING_OS_ID" ;;
esac
;;
Darwin)
PROVISIONING_OS=macos
PROVISIONING_OS_ID=macos
CMD_PKG_INSTALL="brew install"
CMD_PKG_LOCALINSTALL="echo 'TODO how to install a package file on macOS'"
;;
*)
fatal "Unknown system in uname: $uname_s" 42
;;
esac
uname_m="$(uname -m)"
case "$uname_m" in
x86_64|amd64) PROVISIONING_ARCH=amd64 ;;
i[3456]86) PROVISIONING_ARCH=x86 ;;
*) fatal "Unknown architecture in uname: $uname_m" 43 ;;
esac
CMD_INSTALL="sudo install"
}
set_common_environment
set_dry_run () {
if [ x"$PROVISIONING_DRY_RUN" != x ]
then
CMD_PKG_INSTALL="echo DRYRUN: $CMD_PKG_INSTALL"
CMD_PKG_LOCALINSTALL="echo DRYRUN: $CMD_PKG_LOCALINSTALL"
CMD_INSTALL="echo DRYRUN: $CMD_INSTALL"
fi
}
set_dry_run

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -32,25 +32,41 @@
##
#############################################################################
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=./InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
version="1.38.16"
version="1.38.27"
version_node="8.9.1"
urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz"
urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d"
sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages"
urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
targetFolder="/opt/emsdk"
urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz"
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
if uname -a |grep -q Darwin; then
urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz"
urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz"
urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz"
sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa"
sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7"
node_js="$targetFolder/node-v$version_node-darwin-x64/bin"
else
urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz"
urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz"
urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz"
sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
node_js="$targetFolder/node-v$version_node-linux-x64/bin"
fi
sudo mkdir "$targetFolder"
InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
@@ -64,7 +80,7 @@ cat <<EOM >"$targetFolder/.emscripten"
LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
NODE_JS='$targetFolder/node-v$version_node-linux-x64/bin/node'
NODE_JS='$node_js/node'
EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
SPIDERMONKEY_ENGINE = ''
V8_ENGINE = ''
@@ -73,6 +89,9 @@ COMPILER_ENGINE = NODE_JS
JS_ENGINES = [NODE_JS]
EOM
SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\""
SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\""
SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
echo "Emsdk = $version" >> ~/versions.txt
echo "Emsdk node = $version_node" >> ~/versions.txt

Some files were not shown because too many files have changed in this diff Show More