Compare commits

..

424 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
061cf1f2ca Update submodules on '5.12.0' in qt5
Change-Id: I17131af760308b6520dd702eaf7aaf03b9a7d706
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-12-03 19:06:04 +00:00
Qt Submodule Update Bot
820a1fbe7c Update submodules on '5.12.0' in qt5
Change-Id: Id850c3339ddc5fe82ee9c0ef13340e56001fbd15
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-28 04:11:02 +00:00
Qt Submodule Update Bot
07b6c0554b Update submodules on '5.12.0' in qt5
Change-Id: Ice89787923481000fca0409665a366ab8c3540be
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-20 04:06:57 +00:00
Qt Submodule Update Bot
efb253f031 Update submodules on '5.12.0' in qt5
Change-Id: Ib05608e04fe7128046e0573e6c029262e2f8280b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-15 20:03:18 +00:00
Heikki Halmet
84aaa89cf4 Provisioning: Fix path for fbx files
Currently Qt3d Studio build don't recognize fbx path because of space
in folder name. This change will fix it by taken use the packages which
don't have space in the folder name.

Task-number: QT3DS-2440
Change-Id: I502bb04489a03a5a81e164f8a86f3200f4ec3910
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2018-11-13 05:51:53 +00:00
Qt Submodule Update Bot
6c624aa570 Update submodules on '5.12.0' in qt5
Change-Id: I8c971bdcbbca07a8ec03cc4a3dda56ada4afcd00
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-11 18:59:51 +00:00
Qt Submodule Update Bot
829447d340 Update submodules on '5.12.0' in qt5
Change-Id: If218ebc667e5378b1a2527f42c93c456045f1f45
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-09 13:10:15 +00:00
Qt Submodule Update Bot
092b611d80 Update submodules on '5.12.0' in qt5
Change-Id: Ie4dca9cdf3a39a21cd8c380204860ee578733463
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-07 05:00:29 +00:00
Qt Submodule Update Bot
6d6e000932 Update submodules on '5.12.0' in qt5
Change-Id: I41d60616e029d96bb6580345a59ff906ded608d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 10:25:52 +00:00
Michal Klocek
417d293fa7 Add 'qttools' dependency for WebEngine
QtTools module is required for designer plugin.

Fixes: QTBUG-71404
Change-Id: I081740679dace196b9ff42d98bddd941848738f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-05 18:13:19 +00:00
Qt Submodule Update Bot
e4707bcdff Update submodules on '5.12.0' in qt5
Change-Id: Ic6ce42f23f2e567e79d69180b986ae25e97ea1c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-05 18:13:02 +00:00
Liang Qi
9a9f358508 Graduate qtremoteobjects and qtwebglplugin
Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-02 14:56:28 +00:00
Liang Qi
c1376f91df Update submodules on '5.12.0' in qt5
Change-Id: I2dc837b9d8e75176c5ecd3c42e17892676c1f65d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-02 11:21:46 +00:00
Liang Qi
d3299a3d27 Merge remote-tracking branch 'origin/5.12' into 5.12.0
Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f
2018-10-30 12:22:55 +01:00
Antti Kokko
01faa84629 Update qt3d-runtime.txt targets
Add missing macOS and Windows Android arm64 targets.
Remove iOS target that is now included in default.txt.

Change-Id: Ifc20336b94477b2f8be456ef7f7f8bfaf8bf1190
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-30 09:56:38 +00:00
Qt Submodule Update Bot
82ca14ffd0 Update submodules on '5.12' in qt5
Change-Id: I33be3020b077a33f128f18bc920aa89746ba5590
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-29 17:29:18 +00:00
Juha Karjalainen
3b4ca5d6c0 Provisioning: Update openssl to version 1.0.2p
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-10-26 07:23:14 +00:00
Qt Submodule Update Bot
99f8704350 Update submodules on '5.12' in qt5
Change-Id: I38d842c7d9df454cd653ca48574023b25512c62c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-26 07:22:38 +00:00
Qt Submodule Update Bot
70162c557c Update submodules on '5.12' in qt5
Change-Id: Iba893056096d70731449005033a5e3e13d6650c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-25 16:11:03 +00:00
Simo Fält
d65d71731f CI platform config: Make 32 bit msvc2017 config as default
Swapping 32 bit windows packaging configs so that MSVC 2017 is
built as default config and MSVC 2015 only for qt5.

As the config is not part of the default.txt we have to add it as
module specific config.

Change-Id: I3c423c2c80d0093fdeca340d6faa8e162c03b5cd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-25 12:35:07 +00:00
Qt Submodule Update Bot
41b0fbb462 Update submodules on '5.12' in qt5
Change-Id: I86f12f4294fcda16d1aff7ee73681d9fef37403e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 11:39:38 +00:00
Qt Submodule Update Bot
3f76170c93 Update submodules on '5.12' in qt5
Change-Id: Ia2c18f2579af6a1c3e0277cf73a1a219e14b5295
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-23 18:12:59 +00:00
Oswald Buddenhagen
ff2c96f483 Adjust submodule branches
Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03
2018-10-22 15:52:09 +02:00
Qt Submodule Update Bot
7d01b06b8f Update submodules on '5.12' in qt5
Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-22 00:19:52 +00:00
Qt Submodule Update Bot
b621cfd505 Update submodules on '5.12' in qt5
Change-Id: Ie8e19006d5e007e732ca0f68d8128ac3dfc8f498
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-21 09:33:06 +00:00
Tony Sarajärvi
4667cfc432 Update Android NDK and SDK on macOS envs
Task-number: QTQAINFRA-2244
Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-20 05:16:02 +00:00
Tony Sarajärvi
bc5e5baf55 Update Android NDK and SDK on Windows envs
Task-number: QTBUG-47672
Change-Id: I3e6526b296f15927b90ab3310d91f8505b0228b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-20 05:15:55 +00:00
Tony Sarajärvi
97efaacb2b Update Android NDK and SDK on Linux envs
Task-number: QTBUG-47672
Task-number: QTQAINFRA-2298
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-20 05:15:40 +00:00
Qt Submodule Update Bot
6de2d1d211 Update submodules on '5.12' in qt5
Change-Id: I09368e4171c76cc52110b7778491d512d0d43de1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-19 08:27:29 +00:00
Joni Jäntti
c51cbddc90 Provisioning: Windows_7_x86: libclang
libclang is required for qdoc.

Task-number: QTBUG-69793
Change-Id: I60b54b4338ed6fd3bae99813e268816e063c648a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-10-18 11:07:43 +00:00
Joni Jäntti
7e40cd3a7f Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0
Xcode and command line tools version 10 have been released, we
should start building our Qt releases with it, both for iOS and
macOS.

Installing Xcode 10.0.0 requires OS version update to 10.13.6. A new
tier 1 image has been created with the updated OS and this change
takes it into use.

Task-number: QTQAINFRA-2274
Change-Id: Ida7df234ecfd356b2cb2545ae10cd501dc47197b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-10-18 10:59:34 +00:00
Oswald Buddenhagen
4c2fea3d5d fix setting QTDIR_build for default_pre.prf
adding it to the super cache makes no sense, as that's read before
spec_pre.prf, which clears CONFIG. use the regular cache instead.

submodules do not inherit that setting, and they don't need to as per
comment.

also, don't keep adding it to the cache - the cache() function doesn't
check whether the added value is already present, so we need to do that
manually.

amends 31590c0b65.

Fixes: QTBUG-63452
Change-Id: I608559a80a7c772dbdaacfaaadb4fc268b442c39
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-10-18 10:59:31 +00:00
Qt Submodule Update Bot
4061156381 Update submodules on '5.12' in qt5
Change-Id: Ica33ddf6fa348ed65f7194127c80b6e539462e6a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-18 10:59:28 +00:00
Michal Klocek
b365b3853e Make quickcontrols1/2 and webchannel optional for webengine
Fixes: QTBUG-70784
Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-10-16 13:59:23 +00:00
Heikki Halmet
9573b78b56 Provisioning: Use /dev/null when dealing with passwords
This will prevent passwords showing in provisioning logs.

Task-number: QTQAINFRA-2261
Change-Id: I501fd3be64514c59a604c1116113eaf975208024
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-16 13:59:18 +00:00
Jani Heikkinen
0b1493a840 Add packaging feature for MSVC2017 32 bit build
Task-number: QTBUG-63708
Change-Id: Ib7897c5daffa49b014c95db5a6db9d350fe1a5e8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-16 13:59:16 +00:00
Juha Karjalainen
0ac22704fa Provisioning: Disable powershell quickedit
Powershell quickedit causes powershell window freeze until quickedit
mode is exited by pressing enter. For some reason quickedit mode get's
activated during build. This causes time out as agent does not get
any output from processes.

Task-number: QTQAINFRA-2263
Change-Id: I2878cc7a39bae504f826c5622cc5817fd227d7f0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-13 08:41:42 +00:00
Qt Submodule Update Bot
af7dd645c8 Update submodules on '5.12' in qt5
Change-Id: I93231f063bc3c3d29add8ade27803c8f87572dde
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-13 08:41:33 +00:00
Andy Nichols
80aa7d0018 Update qt3d-runtime platform_configs
Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-10 11:26:02 +00:00
Qt Submodule Update Bot
ab670f1967 Update submodules on '5.12' in qt5
Change-Id: If26ce4b6686cf5a704c9d64298a23159780a39e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-10 04:01:57 +00:00
Tony Sarajärvi
61c4be2c0b Add Android arm64 targets
Task-number: QTQAINFRA-2078
Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-10-08 18:21:50 +00:00
Qt Submodule Update Bot
245815a620 Update submodules on '5.12' in qt5
Change-Id: Ibe3ea201ddcb9c555d458296e0f12fcc03fcf0e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-07 08:19:45 +00:00
Joni Jäntti
7b9c3ced84 Provisioning: Ubuntu_16.04_x64: Use internal mirror
Currently the internal package mirroring is being enabled only after
the installation of the packages. It should be done before to
actually download them from the internal repo instead of the
official repos.

Change-Id: I4aeb2e463ae804bd2f8ce9536ab89fc26fedbdb5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-05 12:04:46 +00:00
Joni Jäntti
ca36d5b3fa Provisioning: Ubuntu 18.04: Use internal package mirror
Using internal package mirror during provisioning reduces outgoing web
traffic by a huge amount.

Task-number: QTQAINFRA-2213
Change-Id: I6a63b51efbf411a712795a6347c2deeed6ac44d3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-04 10:08:47 +00:00
Tony Sarajärvi
e85296ba98 Optimize macOS build targets by removing excess builds
Change-Id: I983f7558dabddf7e91f855dbead6dc0172db127c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-10-04 08:03:27 +00:00
Qt Submodule Update Bot
260d66f94e Update submodules on '5.12' in qt5
Updated qtwebengine once againt to have a fix for getting beta1 out

Change-Id: I3de7ad0916e886722186f09da036ea7a398f363f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-03 17:58:05 +00:00
Qt Submodule Update Bot
bc7af0171f Update submodules on '5.12' in qt5
Change-Id: Idb32934a75413896c3a1ea64cd0a69a42d75e9f5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-02 08:11:15 +00:00
Qt Submodule Update Bot
269e38c27c Update submodules on '5.12' in qt5
Change-Id: I1705b1d1b99f4a547bcd6c0c7d17a65f61aea44a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-01 09:10:16 +00:00
Qt Submodule Update Bot
74ab43ba23 Update submodules on '5.12' in qt5
Change-Id: Ib44fb3e8fa52ff72bbe7f92630635a5158a02ed2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-30 14:06:37 +00:00
Liang Qi
d58cfd0db9 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ia649f87c2bc71d9e755b665ef9bc86e2f63f8d0d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-28 05:40:46 +00:00
Tony Sarajärvi
f35067c7c3 Set timezone to GMT in macOS'es
macOS doesn't support UTC, so we'll go with GMT.

Task-number: QTQAINFRA-1641
Change-Id: Ifae9547b010c293c4a2cb18252e8f18961a4456a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-09-27 18:09:38 +00:00
Liang Qi
7520be78cf Update submodules on '5.12' in qt5
Exclude qtwebengine in this round.

Change-Id: Iccbd8d5f4f4c016eab24f8b969aa485bb59a1d62
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-26 04:28:05 +00:00
Tony Sarajärvi
a620807118 Move QNX770 from macOS 10.12 to macOS 10.13
Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-24 17:13:22 +00:00
Tony Sarajärvi
f1256e1f39 Switch MinGW to clang in Windows Android builds
Also as target_compiler is a column now, let's
add the missing information about android target
compiler in the rest of the configurations as well.

Task-number: QTQAINFRA-1682
Change-Id: I6de1ea40383512f5fb8b55242f1a1ac264f9d7d6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-21 16:33:36 +00:00
Tony Sarajärvi
00958e9430 Move packaging from macOS 10.12 to macos 10.13
Task-number: QTQAINFRA-2056
Change-Id: I04b0a282beedce15959b416d716b63bd6197b4a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-19 08:18:21 +00:00
Qt Submodule Update Bot
713ed0c9b8 Update submodules on '5.12' in qt5
Change-Id: Ib09d0026a9427134822303cd05e7f696a5d15a28
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-17 13:04:44 +00:00
Qt Submodule Update Bot
e59a97be63 Update submodules on '5.12' in qt5
Change-Id: I4f74142bd95c043968a80b75ff4a8d69207595dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-16 07:54:56 +00:00
Heikki Halmet
0e0d99d617 Provisioning: Support for Webassembly
This change will install specified packages of Emscripten and set up
the build environment for making binary artifacts of WebAssembly

Task-number: QTQAINFRA-1972
Change-Id: Ia5df6c208ea8f29ca8948f0273f321a59fc694a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-09-15 10:06:47 +00:00
Tony Sarajärvi
c51c0a2b2e Fix shebang on QNX provisioning scripts for Ubuntu 18.04
Change-Id: I74393c3d0382daae9bd1e82a495be19ad2baf90e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-09-15 10:06:43 +00:00
Qt Submodule Update Bot
d25341093a Update submodules on '5.12' in qt5
Change-Id: Ib41f214459b3e5dfc5f509871facc6c2212237ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-15 10:06:40 +00:00
Liang Qi
dada6497fb Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iac3eb41931081588a08916ddce51dae977c6ef15
2018-09-12 21:50:27 +02:00
Joni Jäntti
974884c0d1 Provisioning: Rebase Ubuntu provisioning
Some provisioning changes made to Ubuntu 16.04 didn't make it to 18.04
when the new platform was introduced. These changes need to be included.

Task-number: QTQAINFRA-2210
Change-Id: Ie8c3cfda95abadbd3a416545ebcfbbab8c0cb4ad
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 18:16:02 +00:00
Qt Submodule Update Bot
9a7969f76c Update submodules on '5.12' in qt5
Change-Id: I1f0cfca076840b06faf3ed8b606857be3f690e41
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 18:15:57 +00:00
Qt Submodule Update Bot
7bc473908e Update submodules on '5.12' in qt5
Change-Id: Icf10a073edbc1dde7868d4390dacd6935c037522
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-11 13:32:30 +00:00
Johanna Aijala
1cad3084a9 Use Squish 6.3.2 Qt5.10 on Qt5.12 RTA tests
Update to latest Squish versions that Froglogic is providing. May need
to update to Squish 6.4 later, but now we use 6.3.2.

Change-Id: I89e1f20b58cdd2e948c8021a5fdc357bfc201db1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-11 13:32:27 +00:00
Joni Jäntti
36dbfa3b97 Provisioning: Add chmod +x to Squish .run file
This file needs execution rights before it can be run in provisioning.

Change-Id: Id49de89e0260b18a71cbcd4f4dc2b5a28e0a9890
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-11 13:32:23 +00:00
Tony Sarajärvi
d038ea6757 Provision GCC 8.2 to Ubuntu 18.04 and set as default compiler
The provisioning scripts supports prebuilt binaries. When available,
those are extracted taken into use. If they are not found,
sources are downloaded and built.

Task-number: QTQAINFRA-2066
Change-Id: Id1a59be2d1cbdb29d316ade572c3ce8f17ad3a6b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-09-11 13:32:20 +00:00
Liang Qi
0a5c08be35 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Id55013815613d188ffaf46d7eb9bdb8c46085898
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-10 13:00:22 +00:00
Liang Qi
e866953948 Merge remote-tracking branch 'origin/5.11.2' into 5.11
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35
2018-09-10 10:12:36 +02:00
Qt Submodule Update Bot
e95824f59e Update submodules on '5.11' in qt5
Change-Id: I15c5af9f1985ad113fd63c3366bd7f4d8612e4af
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-10 07:38:43 +00:00
Tony Sarajärvi
d038865e65 Fix license text of provisioning script
Change-Id: I542da038dd087b1705d1ceb475a1656eeec84c91
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-08 12:24:09 +00:00
Qt Submodule Update Bot
3a5feff2a2 Update submodules on '5.12' in qt5
Change-Id: I84ed5c723c9c3bef9f509a30502b93af2dde844b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-08 12:23:52 +00:00
Qt Submodule Update Bot
bf0b84a051 Update submodules on '5.11' in qt5
Change-Id: Ie1bf232eae589efe512178d158aef2f3c09a2b7c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-07 05:30:18 +00:00
Qt Submodule Update Bot
d6a82a8416 Update submodules on '5.12' in qt5
Change-Id: Ica545d4ea4639924b24dd6d75ff614075879955d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-07 05:13:44 +00:00
Antti Kokko
6a919fb8f5 Use MinGW73 for building Qt3D runtime QNX targets
Change-Id: I0fc650345dcffe8840f440db74cf4d9d48465bf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-09-06 11:41:52 +00:00
Qt Submodule Update Bot
daae11c62b Update submodules on '5.11.2' in qt5
Change-Id: If0f3dc30be6ad8e10d81c0b8861c9523a07c0894
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-06 11:41:48 +00:00
Liang Qi
fd922eb4b1 Update submodules on '5.12' in qt5
Change-Id: Ifda91b5137093a660d23591f1252c4c8f1c2f2c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-06 11:30:35 +00:00
Dominik Holland
7fe274f6f6 Correctly use pip3 to setup a wheel cache for python3 packages on linux
Previously pip was used (instead of pip3) which caused that python2
packages were installed into the python3 wheel cache folder. Some of
the packages also worked for python3, but not all of them.

Task-number: AUTOSUITE-195
Change-Id: I393d036667b14e11dee65975ba6933e7174d0e9d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:59 +00:00
Qt Submodule Update Bot
db7391647f Update submodules on '5.12' in qt5
Change-Id: I16bee67a353e15b2d30207eb3c0979d25a449b5c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-05 05:53:54 +00:00
Joni Jantti
83f6543be8 Provisioning: Move Android NDK to macos 10.13
Task-number: QTQAINFRA-2158
Change-Id: Iddf3bd2609e6b06b33cbe2258075157e91e52e8e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:51 +00:00
Joni Jäntti
ccc960b6be Provisioning: Ubuntu 18.04: QNX700 and QNX660
RTA testing needs QNX platforms installed on Ubuntu 18.04 as well.

Change-Id: I8cf95dc5eb12761f82081bfda0973cc19a2864bc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:47 +00:00
Qt Submodule Update Bot
040ca5e267 Update submodules on '5.11.2' in qt5
Change-Id: If055dba4544826db368e5d46bb8d6b622e08d892
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-05 04:40:45 +00:00
Qt Submodule Update Bot
72505cc55b Update submodules on '5.11' in qt5
Change-Id: I35ae3d03cfa8f5dd202218ffb7d2f0057eb41660
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-04 21:30:42 +00:00
Qt Submodule Update Bot
b9b8066d97 Update submodules on '5.11' in qt5
Change-Id: I89b673b1078c0ffab7e4710b2718008c46127bad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-04 08:45:49 +00:00
Liang Qi
75e33d94bd Update submodules on '5.12' in qt5
Change-Id: I48c73c56b339a8e28b7c1641f3160aa8febf188d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-04 08:29:11 +00:00
Tor Arne Vestbø
b5a989133a Version Xcode application bundle when provisioning macOS images
By versioning the Xcode installation we open up for having multiple
Xcode versions installed on the same image in the future, which
allows for e.g. choosing the Xcode version in the build config.

By running xcode-select to choose the bundle, we ensure that
build steps that do not know that Xcode has been versioned
will still pick up the right compiler and SDK paths when
e.g. running xcrun -find clang.

Done-with: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Change-Id: I0bd877bd344cebdd1fbf3a3035b00069f75c4c96
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:08 +00:00
Maurice Kalinowski
61ce2045be Provisioning: Add mqtt broker to Ubuntu 18.04
The broker is required to run tests of the mqtt module.
This is a followup of e89420945f which
was missing this part.

Task-number: QTQAINFRA-1983
Change-Id: Ibcc79aecbf1212ecc64150c911ecf296c7f58e19
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:05 +00:00
Tony Sarajärvi
7d0c343fc6 Cleanup of RHEL 6 codes from provisioning scripts
RHEL 6 has been removed in 5.12+ verifications, so no need
to maintain those changes.

Change-Id: Ie65120bf8ec7a7d0aaa71b7c28e95283263e62eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:01 +00:00
Tony Sarajärvi
413fcafc14 Change 'test suite' in license headers of prov scripts
Change-Id: I9687bcb15b26287ea6eeb2098079137d6e3fc288
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-04 08:28:58 +00:00
Joni Jäntti
7cbb032dc5 Provisioning: Fix vclib path on x86 machines
The path was incorrect for x86 Windows machines since they use "Program
Files" without the "(x86)" suffix.

Change-Id: Iecfee3b568a4d23b056fab230891f7eeb4d63cc8
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-09-04 08:28:55 +00:00
Liang Qi
c478262c26 Update submodules on '5.11.2' in qt5
Change-Id: Iebe3db08c265da0185b58c67aeae3765f8eb5616
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-03 19:38:40 +00:00
Heikki Halmet
c870b9b13f Provisioning: Disable mlocate from linux
No need to update the locate database

Task-number: QTQAINFRA-2099
Change-Id: Iae8bf26e4b04ff9c287e9e3f4cc6f492e74355e4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:37 +00:00
Heikki Halmet
967129344a Provisioning: Remove update-manager
Task-number: QTQAINFRA-2104
Change-Id: Ieaf0801099d8c90821c2b8d9db7da47730fd8abb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:34 +00:00
Heikki Halmet
cd9b6276b8 Provisioning: Disable Cracklib-runtime
Task-number: QTQAINFRA-2104
Change-Id: I784fa1b3d8c98d765bfdea929fdb494ca63e09d3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:32 +00:00
Liang Qi
2e6a5787ef Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: I74de8fc02d0c0295dc7746defe11bed50fb0ba5e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-31 13:37:51 +00:00
Frederik Gladhorn
8b4d267af7 Add Fixes: tag to commit template
Change-Id: I2ad6829901be73bd18a8785c2bee3acd3ba20bcc
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-08-31 08:35:56 +00:00
Frederik Gladhorn
5872e22f31 _clang-format: indent initializers with four spaces, not eight
Change-Id: I9fc644554bd326a3a54163072b7b9e06253a5ff2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2018-08-30 09:09:28 +00:00
Antti Kokko
f70c304b5e Add qt3d-runtime targets
Task-number: QT3DS-2126
Change-Id: Ibce83cbd513bc0083ac149ed453fc9eb217c1d7a
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2018-08-30 08:35:36 +00:00
Liang Qi
1b65a5d73a Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
2018-08-30 09:50:50 +02:00
Joni Jantti
e89420945f Add Ubuntu 18.04 to the CI
Qt 5.12 will have both 16.04 and 18.04
LTS releases verified. Some configurations
are upgraded from 16.04 to 18.04.

Task-number: QTQAINFRA-1983
Change-Id: I1b5c2a1c23ce209040b3478cff21b7f6436a9b54
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-30 04:53:50 +00:00
Qt Submodule Update Bot
5a2a93ddf4 Update submodules on '5.11' in qt5
Change-Id: Ibde23ec3cee72507c530db0e00c9037d84768890
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-29 21:30:44 +00:00
Frederik Gladhorn
e470da9d65 Make xmlpatterns depend on declarative
After moving the xmllistmodel into qtxmlpatterns we can reverse the
dependency. This will improve build times and cleaning up dependencies
makes sense in any case.

Change-Id: I560d51ee47167a0cb519b98a15e6eb9199b4cd79
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-29 05:50:07 +00:00
Liang Qi
cf405ea20e Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: Iad9c2862709be91155a9a72af77fb769528768cc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-29 05:50:00 +00:00
Liang Qi
2b2a639fb9 Unify the iOS/tvOS/watchOS builds in default.txt
Then we can save more virtual machines.

DebugAndRelease V.S. Release(build time):

qtbase
* iOS static: 14min, 57s : 11min, 35s
* tvOS: 17min, 24s : 9min, 38s
* watchOS: 16min, 36s : 9min, 46s

The longest ones, some win10 builds, are about 40 min. And the
longest ones for tests, are about 1 and half hours.

qtdeclarative
* iOS static: 19min, 10s : 12min, 19s
* tvOS: 20min, 35s : 12min, 55s
* watchOS: 15min, 17s : 9min, 59s

qtwebengine
* iOS static: 12min, 48s : 4min, 14s
* tvOS: 6min, 6s : 4min, 10s
* watchOS: 6min, 21s : 6min, 13s

Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-28 19:02:05 +00:00
Qt Submodule Update Bot
7b029c8ca2 Update submodules on '5.11' in qt5
Change-Id: I37c29f60c68926fc6cd8b02d06ea139675f6c80e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 19:02:01 +00:00
Tony Sarajärvi
3044d0d454 Enable autotests on macOS 10.13
Task-number: QTQAINFRA-1301
Change-Id: I65680f2a0fd42b7473da05f71a8f1cb3d733a360
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 16:29:52 +00:00
Liang Qi
e999cc7df9 Move iOS/tvOS/watchOS build host to macOS 10.13
Task-number: QTBUG-70180
Change-Id: I6b4b90883cccfdaedbeb0440b62a1b8290655838
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-28 05:05:48 +00:00
Liang Qi
02336a3ac0 Provisioning: need to install packages in Xcode
Task-number: QTBUG-70180
Change-Id: I23134b887bf7fa05e29bd16769fdb9c7f025764e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-08-28 05:05:44 +00:00
Liang Qi
5f57766742 Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: I1a4a5cbf3817b40e47701fdc5a0f6f4df18633c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 05:05:41 +00:00
Frederik Gladhorn
b54ad48585 Merge remote-tracking branch 'origin/5.11' into 5.11.2
Change-Id: I376800d8d095d483bbf5342d90fc5e013415e59a
2018-08-27 15:54:13 +02:00
Simo Fält
d0d326dddd Replace MinGW 5.3.0 with 7.3.0
Task-number: QTQAINFRA-1289
Task-number: QTQAINFRA-1389
Change-Id: Ic6f637170cd4b98ece45811e66dbb21dc3ee66e3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-26 19:16:55 +00:00
Heikki Halmet
a2289e9b4e Provisioning: Change mesa_llvmpipe to use ci-files01-hki as primary url
This will reduce download time

Task-number: QTQAINFRA-2170
Change-Id: I8313764f7d440e2300a8efabfe4e4226a591d339
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-25 07:09:14 +00:00
Heikki Halmet
32fcfb08ce Provisioning: Change jom to use ci-files01-hki as primary url
This will reduce download time

Task-number: QTQAINFRA-2169
Change-Id: If36ac57daa7066cdd97d5d893a105b812e0eee18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-25 07:09:11 +00:00
Qt Submodule Update Bot
6945c8487c Update submodules on '5.11.2' in qt5
Change-Id: I63679cff0e7469b9483e521dfa5f59d355e6562e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-25 07:09:07 +00:00
Tony Sarajärvi
5745c4da94 Cleanup of unused macOS 10.10 provisioning scripts
Change-Id: Iae988527c2ed9a27bb724072064cd6d1dcd55f08
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 18:24:57 +00:00
Maurice Kalinowski
ba5211d85f Provisioning: Fix open62541 on msvc2015 x86/x64
The correct vcvars resides in Visual Studio 14, not 12.

Change-Id: I89e75b4c5c7806ac451f645b3bf341f588818040
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-08-24 18:24:53 +00:00
Simo Fält
0125d70806 Provisioning: Disable spotlight in macOS
While the VM we launch is a clean image the spotlight starts indexing
right after the boot. That seems to require quite a lot of resources.
Build machine doesn't need the feature, so we are disabling it.

Change-Id: I2c5f0030d7a687cfbded4e9bd4da70302cb0a933
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 18:24:50 +00:00
Simon Hausmann
9a7555e54d Fix failing assertions in QML when running under qemu
Unfortunately the user-space emulation mode of qemu does not implement
MADV_DONTNEED, which is a feature that the garbage collector of QML
relies on. Patch is submitted to the qemu list and included here to fix
the imminent issue we're seeing.

Task-number: QTBUG-68349
Change-Id: I2bb15513a1e5a7ad03eeae98d77691336985a20f
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-08-24 18:24:47 +00:00
Qt Submodule Update Bot
c620015aac Update submodules on '5.11' in qt5
Change-Id: Icfc06ccf7128083957edc4478cd810cbb259186c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-24 07:22:49 +00:00
Tony Sarajärvi
096780db16 Drop testing of macOS 10.11 in the CI
The 10.11 configurations were bumped to 10.12 configurations.
The 10.12 packaging configuration will be deleted once autotests
have been enabled for 10.13 and packaging moved to 10.13 cross
the board.

Task-number: QTQAINFRA-2055
Change-Id: I17c598a306487e9a2f72006c3fa02e4ee683ee12
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 06:50:09 +00:00
Qt Submodule Update Bot
4b2a2d2d92 Update submodules on '5.12' in qt5
Change-Id: I82cbc9879fd675685e3ac4eb4b368f975c2a27a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-24 06:50:05 +00:00
Liang Qi
2a439be756 Update qtbase manually
Change-Id: Ic48eee5dcf4b6f05713a6ab04c39cfcb6baa8bef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-23 14:36:48 +00:00
Simon Hausmann
cdb1230145 Manual update of just qttools to pull in libclang build fix
Task-number: QTBUG-69793
Change-Id: I9852567a5268be62b45f605bc0e7a0248278c931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-23 09:28:59 +00:00
Simon Hausmann
1e9fb7f9d9 Prospective fix for build of qttools on Windows with QNX target
This modules contains qdoc as a host build tool, which needs to be built
with MinGW 7.3 as host compiler in order for the libclang linkage to
succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is
set on the Windows 10 machine.

Task-number: QTBUG-69793
Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-08-23 09:28:56 +00:00
Heikki Halmet
3dd549d618 Provisioning: Fix activate of static linking for libclang
Task-number: QTBUG-69793
Change-Id: Ib5151e16d0e040a63a3f7fce054f2fad6abb2b6d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-23 09:28:51 +00:00
Qt Submodule Update Bot
c3e5f325bb Update submodules on '5.11' in qt5
Change-Id: I4f4c59dc396299e2c6a398521174e91cc7cac2ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-23 09:27:34 +00:00
Qt Submodule Update Bot
f35a0cb742 Update submodules on '5.11' in qt5
Change-Id: I4195ceeeefeb98c8d600b86079f986d2d18e6884
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-22 04:31:17 +00:00
Qt Submodule Update Bot
6b6f337925 Update submodules on '5.12' in qt5
Change-Id: Ie06d6075cf0f157f892e829dabdf5890a646b4ce
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-21 15:13:59 +00:00
Qt Submodule Update Bot
79c3ea18ed Update submodules on '5.11' in qt5
Change-Id: I3b4d492fcaca7b1519fea144a944aefda68299ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-21 10:37:49 +00:00
Liang Qi
5360fc7fcf Merge remote-tracking branch 'origin/dev' into 5.12
Change-Id: I593555fd39b6499d241acb00cc656bcdbef83d77
2018-08-21 09:26:11 +02:00
Tony Sarajärvi
92088b295c Upgrade Xcode to 9.4.1
Task-number: QTQAINFRA-2136
Change-Id: I57f64c3dc3b91f21bb6d42ab5dc5163db75120b9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 19:02:25 +00:00
Qt Submodule Update Bot
6c225347aa Update submodules on '5.11.2' in qt5
Change-Id: I34da23765b048c8e3348d6ac05b18598bfefcd83
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 16:16:31 +00:00
Liang Qi
42f4bdd051 Update submodules on 'dev' in qt5
Change-Id: I15b2964fb22fdac38f172b2a24852fb90a255649
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 15:47:47 +00:00
Oliver Wolff
f8086955b3 Provisioning: Install debug version of vclibs for UWP usage
RTA relies on the availability of debug vclibs. The frameworks are usually
installed on first usage by Visual Studio, but as we use winrtrunner, we
have to install the packages manually.

Task-number: QTBUG-69809
Change-Id: I66cc4b04062afe634345cddc8ab4d001778274cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-20 13:23:49 +00:00
Qt Submodule Update Bot
8a559f20e3 Update submodules on '5.11' in qt5
Change-Id: Id6f78adf7c0c3f455b798ad1bc80c7097b519e0b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-18 20:52:25 +00:00
Joni Jantti
6077565b3e Provisioning: openSUSE_42.3: Wait for PackageKit to finish
Provisioning sometimes fails if PackageKit is locked at the moment we
try to remove plasma5-pk-updates package.

Task-number: QTQAINFRA-2141
Change-Id: I5e6c2ecab87033ce01aae915813e1d5f70ea8186
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-08-17 16:01:57 +00:00
Maurice Kalinowski
21b3591580 Provisioning: Update MQTT broker
Required to get shared subscription testing working, namely to fix
https://github.com/eclipse/paho.mqtt.testing/issues/56

Change-Id: Ib8657cde0d8e33135bbc2ebcb9558f8e6b13e40f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-08-17 16:01:51 +00:00
Qt Submodule Update Bot
50ef5744f5 Update submodules on 'dev' in qt5
Change-Id: I3968edabb171ffaf9d498f8aaad90843a04fb9ee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-17 16:01:48 +00:00
Oswald Buddenhagen
e49e7fc8ad Adjust submodule branches
Change-Id: Ie460cb41d050c1b73e71278469a8231e294db3e3
2018-08-17 16:03:52 +02:00
Oswald Buddenhagen
31590c0b65 set QTDIR_build in .qmake.super
this suppresses license checking in default_pre.prf in the super module.
submodules set it via their .qmake.conf's.

Change-Id: Ic3599613140169eeacb48385be8f324c4bef8f1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-08-17 13:57:40 +00:00
Qt Submodule Update Bot
d4479f59f8 Update submodules on '5.11' in qt5
Change-Id: I78af59a68a665f7dec71495a58bf4c2e9e23ade3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-17 11:13:36 +00:00
Liang Qi
530a923e68 Update submodules on 'dev' in qt5
Change-Id: Ibc222c15fe9a02dd4ed34fb3cd4724180bb45680
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-17 07:17:36 +00:00
Qt Submodule Update Bot
82401c04df Update submodules on '5.11' in qt5
Change-Id: I4c4d079e17fbab5d98b35a9f9311052ac036bb64
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 18:42:31 +00:00
Liang Qi
02b7a0b984 Update submodules on 'dev' in qt5
Change-Id: Ibe68c18b979b20890cfcbfdbedb1620f7914bba4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 17:50:20 +00:00
Qt Submodule Update Bot
c8016c0093 Update submodules on '5.11' in qt5
Change-Id: If4f598db669ad39d1a0f1042d3666a548aeb3370
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 04:16:53 +00:00
Liang Qi
c00f007d32 Update submodules on '5.12' in qt5
Exclude qtbase in this round.

Change-Id: I0b4c1359b5f5016a1732a290d8e0affa50182e69
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 08:16:58 +00:00
Liang Qi
ab25e989b1 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: I9b781f1add1dea2723e799928db253720b1f2bbd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 08:11:25 +00:00
Liang Qi
726cfcb376 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: I5cc23b431b7a02ad81bba67af3b124b169f02507
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 06:07:22 +00:00
Qt Submodule Update Bot
53a457820c Update submodules on '5.11' in qt5
Change-Id: Ie97b7d21aeb8326256943a646dce4271405f6982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-15 04:31:14 +00:00
Ryan Chu
23560769c1 Provisioning: Update QEMU toolchains of boot2qt
Docker-based test server needs mdns to resolve .local while testing qt
network stack in CI. Otherwise the tests would not see announced
services.

Relates to yocto/meta-boot2qt 7608ebe44f65f4d525081cf9a5b12cfa05792a8f

Change-Id: If834b01668bcf844e475e863eb1337849c718270
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-08-14 21:08:29 +00:00
Oswald Buddenhagen
8b46f403c8 Adjust submodule branches
Change-Id: Ia24ec2ff93495eed938c5dddab83934327ced02e
2018-08-14 13:00:09 +02:00
Qt Submodule Update Bot
ff39808a80 Update submodules on '5.11' in qt5
Change-Id: Ic2fbb75fb89fe0d5ef8204a0ca56dbb8c20aa47d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-12 08:50:46 +00:00
Liang Qi
013d1fd540 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: Ie6f33cfdba6f17c105660263c444a7386561d038
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-11 21:01:28 +00:00
Qt Submodule Update Bot
c5d9951e7f Update submodules on '5.11' in qt5
Change-Id: If6a2c0aaa5d8c906c5b128780e96e287229b0aa8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-11 11:25:52 +00:00
Qt Submodule Update Bot
f785a27eac Update submodules on '5.11' in qt5
Change-Id: Idc7f48f35f25f8b9373aee159ebf742338bc5a50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-10 12:48:24 +00:00
Maurice Kalinowski
bc644fd6c9 Provisioning: Update Open62541
Change-Id: I1a1402f80d31d6063cca1838e0b7c3ebbe2d876c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-08-09 13:30:16 +00:00
Joni Jantti
bb6a91d5d4 Provisioning: PyPFD2
Required for QSR documentation.

Task-number: QTQAINFRA-2103
Change-Id: I4da98460fb5d5ad26f9e1e16c503a0d94be047a6
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:11 +00:00
Joni Jantti
33276c1719 Provisioning: Win10_x64: Remove MS Zune Appx packages
Windows 10 has these Zune Audio and Zune Video packages installed that
often open up automatically when accessing the VMs through VNC for
example. Removing the packages gets rid of this annoyance.

Task-number: QTQAINFRA-2121
Change-Id: I09aa276fcb06ad84321709e64bcfd71fbd33c657
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:08 +00:00
Joni Jantti
19f1bf803c Provisioning: OpenSUSE_42.3: Set GRUB_TIMEOUT to 0
Setting the grub timeout to 0 will save us some time during the bootup
phases.

Task-number: QTQAINFRA-1703
Change-Id: I6dc6fbac0cfe54608068531eba4808cf87cf435c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:06 +00:00
Liang Qi
27c5523b3d Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: Id70accc133763b3570c19630e7161215f326fd84
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-09 13:30:02 +00:00
Qt Submodule Update Bot
fe66f9a927 Update submodules on '5.11' in qt5
Change-Id: I5513ef5d623e23ec68934cf129efa60eeee58bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-09 01:34:03 +00:00
Simon Hausmann
76d922b211 Add soft qtdoc => qtquickcontrols 1/2 dependency
The photoviewer demo imports QtQuick Controls 1 and the coffee demo
imports Qt Quick Controls 2. This is a run-time dependency for dynamic
builds, but for static builds it becomes a build time dependency.

Change-Id: Ie8d7dcf85c2dfe93033fa9254ee350fb654475c3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-08 14:13:28 +00:00
Oswald Buddenhagen
0a65cf0e9c add soft dep qtdoc => qtmultimedia
at least the maroon demo will use the multimedia module if available.

Task-number: QTBUG-69823
Change-Id: I7e0f7103aaf1a33a755b9a362274273a9b997f37
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net>
2018-08-08 10:21:09 +00:00
Ryan Chu
4ece0e74ef Update provisioned boot2qt version from 2.3.1 to 2.3.4
Docker-based test server needs mdns to resolve .local while testing qt
network stack in CI. Otherwise the tests would not see announced
services.

Relates to yocto/meta-boot2qt 2f17ab34687ef100c4390057dd220ab431ec8ff8

Change-Id: I5313fc34634211ae6950769518c68c2b11d77eb3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-08-08 10:02:53 +00:00
Qt Submodule Update Bot
1b7b7b363f Update submodules on 'dev' in qt5
Change-Id: I0dec993ba45ada4bf0d5e8f95d511f85b3c8246b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-08 09:28:48 +00:00
Qt Submodule Update Bot
5088f70e7c Update submodules on '5.11' in qt5
Change-Id: I990522ab7bca86409285b39aa6a9e5d74df9653c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-08 07:50:49 +00:00
Joni Jantti
07e349546c Provisioning: Update QNX packages with security patches
BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that
we want to include in CI since out customers will most likely have them
installed.

Task-number: QTQAINFRA-1535
Change-Id: I6f38ca8831bb91609f79385a2dcbc51302f68eb8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-07 18:11:43 +00:00
Qt Submodule Update Bot
7c6f78a52e Update submodules on '5.11' in qt5
Change-Id: I670025f9dbbdcaa67f211fb6f5dd616b1a428b1c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-07 08:37:14 +00:00
Liang Qi
d746bc3ea8 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
2018-08-06 11:31:33 +02:00
Qt Submodule Update Bot
a43a23f7d1 Update submodules on 'dev' in qt5
Change-Id: Ibe8b3b0b97289dff2dd8b91a25028e0aa53875ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-06 07:45:07 +00:00
Qt Submodule Update Bot
a4654e2aaa Update submodules on 'dev' in qt5
Change-Id: I890f8b105ff51503737f757cf4d681d5029b22a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-05 15:27:19 +00:00
Qt Submodule Update Bot
00730d1caf Update submodules on '5.11' in qt5
Change-Id: Ibe011d723e946afb21d6631ba0b6c9ef25aa9e43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-05 15:27:11 +00:00
Kai Koehne
8646f7cf9e Remove outdated archive names from README
There are no distinct commercial and opensource source archives anymore.
Some people do also build from git, so adding the archive name
here is just misleading. Given that users read the README, they arguably
should know already where the sources are ...

Change-Id: I42aac84cd0c904b7b6f2dbb19cacf8b3021f6b21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-08-04 12:12:11 +00:00
Maurice Kalinowski
53f4bb2d92 Provisioning: Update MQTT test broker
Updates required for latest MQTT5 features and fixes.

Change-Id: I63e967efafbe1b22800e338b6c431febe3389a45
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-04 12:12:06 +00:00
Maurice Kalinowski
f2fae0b7b1 Provisioning: MQTT: Switch download order
We should try the internal ones first.

Change-Id: Id0bb3c00e0a1359004f66435a452c30ee4997689
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-04 12:12:00 +00:00
Qt Submodule Update Bot
814b318048 Update submodules on '5.11' in qt5
Change-Id: Ic787c30a4a0654d4f0cd8fd484ff9ce0247e0030
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-04 12:11:55 +00:00
Joni Jantti
aeb39be740 Upgrade Android NDK to r16b and switch to clang
We need to upgrade the Android NDK version
when we switch to building with clang.

Task-number: QTQAINFRA-1681
Change-Id: Ic43b28ead393ec5828b099727182df5f4424f419
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-04 05:06:22 +00:00
Qt Submodule Update Bot
a97bea0821 Update submodules on 'dev' in qt5
Change-Id: Ib23bce6910ad849e3dc3d70cbc2fd042071c5c6c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-03 18:49:58 +00:00
Fredrik Orderud
d60ef0b202 Remove broken qtquick1 submodule
This submodule have not been maintained in several years. Building currently
fails due to qtquick1 not being in sync with interface changes in qtbase. I
think it's therefore better to just remove the submodule altogether. That way
we stop causing problems for external developers wanting to build Qt from
source.

Task-number: QTBUG-69725
Change-Id: I905888d99f510be12c484f7da52986c9b1e9478f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-02 19:33:13 +00:00
Tony Sarajärvi
0bdbc37b43 Only update qtserialport
For a fix on Android.

Task-number: QTBUG-69727
Change-Id: Ie7d000dece247678e80c7d7db08c0ac3763bc8a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-02 18:31:04 +00:00
Qt Submodule Update Bot
51ea6f2895 Update submodules on '5.11' in qt5
Change-Id: I43f504b9f30ce021fc38f7115cbc7d61d9b9d790
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-02 01:33:00 +00:00
Tony Sarajärvi
37ad6b0144 Use local Ubuntu repositories with Ubuntu 16.04
Using cached local repositories saves us outgoing
bandwidth. This way we also get version pinned packages.

Change-Id: I475c62c3e408d71e85f24d74dd384c62de583403
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-08-01 14:51:15 +00:00
Qt Submodule Update Bot
781d243f89 Update submodules on '5.11' in qt5
Change-Id: I3989272610c8c491f9c3a989e79cae36ad036d88
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-01 11:11:55 +00:00
Frederik Gladhorn
b6fd915b26 Remove packagekit (update notifications) from RHEL 7.4
PackageKit and gnome-software run in the background and at some point
will show popups to ask the user to update.

Change-Id: I99a3314c8788c7cc06e479718306a822bf255fbd
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-07-31 15:09:08 +00:00
Simon Hausmann
21995a6158 Fix dependencies of the qtdoc module
After commit 01d2f35b6988edacc741b358703d16d4cd8c199a in qtbase, the
existing CONFIG+=lrelease in examples/demos/photoviewer/photoviewer.pro
now calls lrelease and thus requires qttools.

Change-Id: I7cabc70fc6316a49793d7e91a493d8a5e5028295
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-07-31 14:36:44 +00:00
Dominik Holland
f9f9e0944d Download and cache needed python wheels during provisioning
Instead of downloading the packages during the compile/configure
step setup a wheel cache folder during the provisioning phase

Task-number: AUTOSUITE-195
Change-Id: I465f1be7cdd351e7680dcd8ae22d5e97ddf8cb2d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-07-31 14:36:41 +00:00
Qt Submodule Update Bot
f128708e34 Update submodules on '5.11' in qt5
Change-Id: Ie6ec2358ba3df679b0d7bc30f9c17935fc19993b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-31 05:12:39 +00:00
Qt Submodule Update Bot
fc44b43851 Update submodules on '5.11' in qt5
Change-Id: I620723f0983da8a0bf8e19348a6a0be2d02c1341
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-30 19:56:26 +00:00
Qt Submodule Update Bot
d16c0d2675 Update submodules on 'dev' in qt5
Change-Id: Ic321b9e43d8e744049142b01d40728460f5722f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-26 09:11:43 +00:00
Qt Submodule Update Bot
dc406ec87e Update submodules on '5.11' in qt5
Change-Id: I7ad748481565042891e28dc17385e8229ea18c73
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-26 07:53:33 +00:00
Qt Submodule Update Bot
c8d7e38778 Update submodules on 'dev' in qt5
Change-Id: I0b014bee5ef1621a1dc3c02571ba0aff52d8cf2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-25 09:36:09 +00:00
Qt Submodule Update Bot
c00bed4a42 Update submodules on '5.11' in qt5
Change-Id: I77c1b4607fc857de5c9ee9abfa8e81f4bc8f0e0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-25 09:35:47 +00:00
Qt Submodule Update Bot
11851f418b Update submodules on '5.11' in qt5
Change-Id: Ie65a8302aa83a5c7c83c5c4ca2debcb9fe116e3c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-24 08:49:34 +00:00
Qt Submodule Update Bot
cd852d51eb Update submodules on 'dev' in qt5
Change-Id: Ie9f30b588c9f959f049f1f3b0830ac2894f284ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-24 07:41:11 +00:00
Simo Fält
a7a31600b4 Provisioning: Update cmake to 3.11.3 on macos
It seems that cmake 3.6 had issues with more recent XCode. Since XCode 8
the sysroot folder might have been unversioned (MacOSX10.12.sdk ->
MacOSX.sdk). In that case older cmake can't detect correct SDK
version. This is causing issues when building Pyside2.

Change-Id: I09f0ed4fe6d15ba3d60aa3a6e9a9b3b9091996c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-23 20:19:30 +00:00
Qt Submodule Update Bot
34e0a56144 Update submodules on '5.11' in qt5
Change-Id: I681548a12fec32f415694bc6a397a202c876e8e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-23 07:16:15 +00:00
Qt Submodule Update Bot
60cdf0d303 Update submodules on 'dev' in qt5
Change-Id: Icd056ebc3efef5427b9bfd7ad8fc568855155ad0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-23 06:12:15 +00:00
Qt Submodule Update Bot
231446f684 Update submodules on 'dev' in qt5
Change-Id: Ic9ee5417a89c9a83e6b65d2b33c3fea37dfc9245
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-22 08:31:45 +00:00
Qt Submodule Update Bot
edbd24972f Update submodules on 'dev' in qt5
Change-Id: Ib375f5182203ae1217586bd95bb3a6e0c47429bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-21 11:58:00 +00:00
Qt Submodule Update Bot
5e45a7a26e Update submodules on '5.11' in qt5
Change-Id: I1532481ce8b85e25058b580308c44f531141f1a3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-21 11:57:53 +00:00
Qt Submodule Update Bot
78a597f987 Update submodules on '5.11' in qt5
Change-Id: I27d4627770309abe7a9393e411c82e7ea414b766
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-20 06:50:14 +00:00
Qt Submodule Update Bot
5bd70863f6 Update submodules on 'dev' in qt5
Change-Id: I46590a04c487498f6118cf17bd06114680e4493c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-20 06:49:42 +00:00
Frederik Gladhorn
9cd9258b8b Move _clang-format from qtrepotools
Change-Id: I9ccacaf6ed09bbc0ee3f55bf6f97d96976341d14
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-07-19 12:15:55 +00:00
Qt Submodule Update Bot
b9bc0d8a10 Update submodules on 'dev' in qt5
Change-Id: Idccb3051f2d430ff7b353bc1c8aee341d1314d84
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-19 11:02:13 +00:00
Maurice Kalinowski
44280782ed Open62541 win32: Add python to dev environment
The autodetection of cmake used a different python for x86 builds of
msvc. Those did not have six installed. Instead, use one python for all
build variants to stay consistent.

Change-Id: Id1ad2bc320e47a68358364ff94d78993ba0b0848
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-18 18:30:37 +00:00
Qt Submodule Update Bot
743843bddb Update submodules on '5.11' in qt5
Change-Id: Iac05412210fa6030234b450d87d5b15543fdbbb5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-18 12:55:22 +00:00
Qt Submodule Update Bot
c87e4754b2 Update submodules on 'dev' in qt5
Change-Id: I93cf04ca1ecec20b61cac9275b719ebd3e76c227
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-18 09:30:32 +00:00
Simon Hausmann
344a384030 Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-07-12 09:46:06 +00:00
Andy Shaw
c1fcf7c1ad init-repo: Allow sub-module checkout path to differ from config name
Change-Id: I622a8ed5daee59a96f4c6c28cc8c5e4d20b88f58
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-07-10 15:23:41 +00:00
Ryan Chu
e99fe6b354 Docker Provisioning: Install Avahi and enable mDNS service discovery
The challenge of connecting Docker containers from the host is to
resolve a predefined hostname to an IP address assigned at runtime. For
Unix-like platforms such as Ubuntu, it can be done by either hard-code
the IP addresses or creating a DNS server. Both of them are not
user-friendly which need root permission to modify system files.

Avahi is a free Zeroconf implementation and provides multicast DNS
(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 in a local
domain without extra user-efforts.

Task-number: QTQAINFRA-1686
Change-Id: I1ef464a455cef5d331a3e2eb0194e2741172ef95
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-07-10 14:55:18 +00:00
Simon Hausmann
5913addf85 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1af773187b7dd55bf820ce7d3218a9f3121c198a
2018-07-10 09:11:31 +02:00
Oliver Wolff
c2c2a14091 provisioning: Update winrtrunner
winrtrunner is from dev. The only change to the previous version is a
longer timeout for deployment, as CI runs now and then failed, because
deployment did not finish in time.

Change-Id: I244e68af447db9298d64bb791048032edd3ec1fd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-09 20:03:32 +00:00
Maurice Kalinowski
4869ad6a49 Provisioning: Update Open62541 install path
Use the updated install path for OPEN62541_PREFIX argument in CI.

Change-Id: Ifa06d002516da20001a94ff6e7066504fa471a8f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-07-04 12:03:37 +00:00
Maurice Kalinowski
7c14e7a5cc Provisioning: Open62541 Update environment variables
Using CI_OPEN62541_<compiler>_<arch>_PREFIX is more verbose.

Change-Id: I58ed0f31935308389f274f93578361db3dc01daa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-04 12:03:21 +00:00
Maurice Kalinowski
9f57c8135a Provisioning: Install Unified Automation C++ SDK on Windows
UA C++ SDK is one of the supported OPC UA backends in the Qt OpcUa
module. The aim is to have packages available with Qt 5.12.

Change-Id: I2d1b3c6c583f4563e7470317d4f73f853bd34c72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-07-04 12:03:06 +00:00
Qt Submodule Update Bot
d92fc36d32 Update submodules on '5.11' in qt5
Change-Id: I789b8631db8db928a08443bb507b5f18d0e49241
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-07-04 05:10:04 +00:00
Qt Submodule Update Bot
54c23f97c6 Update submodules on '5.11' in qt5
Change-Id: Idc7f66cc084706ac4a2bb9a212af764d41301182
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-07-03 06:43:44 +00:00
Ryan Chu
2b6f5f165d Provisioning: Install Docker-based test servers on Ubuntu 16.04
Build and cache docker images based on the configurations in testserver.
1. Download and install the docker engine and docker-compose extension.
2. Append address and hostname of test servers to CI environment.
3. Build and tag the docker images by the SHA-1 of server context.

Task-number: QTQAINFRA-1686
Change-Id: Ib9b58d45856682ddec04af045e1eab18e14a85fb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-07-02 19:20:21 +00:00
Liang Qi
c6d9e433df Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh

Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
2018-07-02 13:12:35 +02:00
Qt Submodule Update Bot
a37b78293b Update submodules on '5.11' in qt5
Change-Id: Ie3dfab4426573c7c9a3312f40cb349cf8b49938f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-02 07:25:45 +00:00
Qt Submodule Update Bot
3e044c71b9 Update submodules on '5.11' in qt5
Change-Id: Icb4cd2f6afe9a7aa4c3000a7006471afd141f562
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-30 08:01:50 +00:00
Simon Hausmann
0a2b499cca Remove unused libclang installations
We don't need to install the MinGW builds of libclang 6.0 for
configurations where the Qt MinGW build can't use them.

Task-number: QTBUG-68064
Change-Id: Id9183ccfc15a7a81edb67df371075d584e5cbae8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-06-29 13:37:38 +00:00
Heikki Halmet
ecb01d283c Provisioning: Fetch icu from ci-files01 instead of master.qt.io
Change-Id: Ia27e68cb94ab0744ce11cfa74c90e118c1f0e4b3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-29 13:37:36 +00:00
Heikki Halmet
74fd490884 Provisioning: Add force option when unmounting squish
Sometimes unmount of squish fail because resource busy even if
the installation is already succeeded. To avoid this let's add force
option to make sure unmounting works every time.

Task-number: QTQAINFRA-1964
Change-Id: Icacd01341d09577d9880e3ed208cb6ea18a7ac4f
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-29 13:37:34 +00:00
Qt Submodule Update Bot
7784f89036 Update submodules on 'dev' in qt5
Change-Id: I61e51dde3ba430920b115511cdc219bf9930927e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 13:18:51 +00:00
Heikki Halmet
4a7366f960 Provisioning: Refactor libclang installation
Libclang must use cached url (ci-files01-hki) to reduce the download time
Libclang release_60 versions were rebuild which requires sha1 changes

Task-number: QTQAINFRA-1966
Task-number: QTQAINFRA-2100
Change-Id: Iddf47a2a3a5bc38dbed684320120164bb40c028c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-06-29 05:49:22 +00:00
Liang Qi
72d711356c Update submodules on '5.11' in qt5
Change-Id: I2d450d444d40d129003461329fa5058ca1c0f140
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 05:49:17 +00:00
Qt Submodule Update Bot
26dd89e493 Update submodules on 'dev' in qt5
Change-Id: Icf069b26f93995833ef35f490f61d9d75fcaf84b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 04:46:09 +00:00
Oliver Wolff
256020fa15 Enable auto tests for winrt x64 using MSVC 2015
We are using a statically built Qt because it eases deployment of
the built tests. As static linking is broken on MSVC 2017, 2015 is
used.

Change-Id: Ie0cc0ee8229da8772ae548ca077e48086ab03adb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-28 23:54:37 +00:00
Oliver Wolff
d103986282 Revert "Enable auto tests for winrt x64 using MSVC 2015"
There are still auto test failures in qtbase for WinRT.
Revert this change to unblock CI and investigate.

This reverts commit 2fb043eace.

Change-Id: I13cc618828f773750c031daaaffce777163f8b8d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-27 14:38:02 +00:00
Oliver Wolff
2fb043eace Enable auto tests for winrt x64 using MSVC 2015
We are using a statically built Qt because it eases deployment of
the built tests. As static linking is broken on MSVC 2017, 2015 is
used.

Change-Id: Iaf665f68ab705f44e93129ff6e25384ae4b5a319
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-26 14:19:37 +00:00
Kai Koehne
92f1fe4e34 Replace commercial preview license with Qt License Agreement 4.0
Do allow people to build from git using the Qt License Agreement 4.0.
The license agreement text is the same as in the installers, except
that some Unicode characters got normalized to their ASCII variants,
and things have been properly wrapped.

This follows qtbase change 60e56f1679d6.

Task-number: QTBUG-52222
Change-Id: Id00d026e47be3bfc488419652d9f53d72d56f0d0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-06-26 08:46:25 +00:00
Maurice Kalinowski
7551b13276 Provisioning: Update MQTT test broker
Change-Id: Ie4e9ff5c13eb5f882b70e4e948836ae78496dd40
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-06-25 06:36:50 +00:00
Qt Submodule Update Bot
c145e9c217 Update submodules on 'dev' in qt5
Change-Id: I0ab9f158a0bb083d7f71da19e8583f7c5dfba536
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-24 09:10:27 +00:00
Qt Submodule Update Bot
f3d761294d Update submodules on 'dev' in qt5
Change-Id: Ib637706a9dbd933edbed0ebc44053e357806d13a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-23 20:59:07 +00:00
Liang Qi
2a58a48318 Merge remote-tracking branch 'origin/5.11.1' into 5.11
Change-Id: I48c80e0162f44a3eca1694d538971ef981d37d2e
2018-06-22 22:20:52 +02:00
Qt Submodule Update Bot
d33170e21d Update submodules on 'dev' in qt5
Change-Id: Ie1267c55571b23166d5989954a12ad07c09a26ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-22 20:18:07 +00:00
Liang Qi
33d5c271f6 Update submodules on '5.11' in qt5
Skip qtbase and qtwayland in this round.

Change-Id: Id405a21fda570ab62588f128536ba77cc01fd080
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-22 07:44:37 +00:00
Qt Submodule Update Bot
519d656f34 Update submodules on 'dev' in qt5
Change-Id: I2a83a076896b9b29103c031a204936816d3fd6f4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-20 06:10:02 +00:00
Liang Qi
ca1f50fa72 Update submodules on 'dev' in qt5
Skip qtwebengine in this round.

Change-Id: I09c52a57592d1bfa8b64a7bf5ea5beed795af02b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-18 13:57:10 +00:00
Qt Submodule Update Bot
32eee8f17a Update submodules on '5.11.1' in qt5
Change-Id: I1b1caa12ea3b4e6c36b2051d88ad8492d17d06cf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-06-17 16:49:03 +00:00
Maurice Kalinowski
bd8fe6a463 Provisioning: Fix downloading from github
Invoke-WebRequest uses TLS1.0 by default, which is not accepted by
Github anymore, causing all downloads from that site to fail. Upgrade to
1.2 to get downloads working again.

Change-Id: Ie242432937c273db5c345b38482dd74c19c3b4ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2018-06-13 18:08:15 +00:00
Qt Submodule Update Bot
a25629abfb Update submodules on '5.11.1' in qt5
Change-Id: Ibc6aaaa9d4de853685695d192495e98d98d81082
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-11 10:47:06 +00:00
Liang Qi
857e3ca32a Update submodules on 'dev' in qt5
Skip qtdeclarative in this round.

Change-Id: Ia70fe1f43ce29cc321111dfc37c55f070cd806d9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-09 13:30:54 +00:00
Qt Submodule Update Bot
bfda8d1f25 Update submodules on '5.11' in qt5
Change-Id: I3b6197f122aaeca5eb1838db41d3fb864eb4043a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-09 08:41:01 +00:00
Qt Submodule Update Bot
cca980f401 Update submodules on '5.11.1' in qt5
Change-Id: I54afe311c809984962f9644830899e00d1766f96
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-08 19:06:14 +00:00
Liang Qi
7b7e0410fd Merge remote-tracking branch 'origin/5.11' into 5.11.1
Change-Id: I0bfda3a8816684275bd7f63372684cdf3e8b9ac3
2018-06-08 13:19:30 +02:00
Qt Submodule Update Bot
4ab6c1dace Update submodules on '5.11.1' in qt5
Change-Id: Ia0779127ef3859678ef194b0af2e4fdb5b25d9f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-06-08 11:02:29 +00:00
Simo Fält
eb1ca70def Provisioning: Add 64 bit Mingw to coin as packaging target
Change will provision DirectX SDK with enabler DotNetFramework also, so
that configure for MinGW will detect ANGLE correctly. The DirectX
headers and libs will be in two location, while those are installed
with MSVC also.

Task-number: QTBUG-35288
Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-06 08:37:51 +00:00
Qt Submodule Update Bot
e28ed4a3a4 Update submodules on '5.11' in qt5
Change-Id: I49fd99ca74e396010e65069e04579daa81b4fab2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-06 06:52:54 +00:00
Qt Submodule Update Bot
02127d3654 Update submodules on '5.11' in qt5
Change-Id: I01ace9bc6ad2805a7a3cdf5b464357e4bad5dc19
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-05 06:00:58 +00:00
Qt Submodule Update Bot
bdbc314b2a Update submodules on '5.11' in qt5
Change-Id: I363b007807ce65746d22ad2e2608aa17c5859deb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-02 10:41:06 +00:00
Simo Fält
6c295ac7f0 Provisioning: Install 32 bit python to 64 bit windows
In order to create 32 bit Pyside wheels we have to be able to link
Pyside against 32 bit python. While 32 Qt build is done in 64 bit
Windows Pyside must follow.

Task-number: PYSIDE-646
Change-Id: I30855d4cecd6bc6219021216e9c296d28c56b405
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-06-01 13:21:30 +00:00
Tony Sarajärvi
de191df84f Add macOS 10.13 to the CI
Includes provisioning scripts and modifications
to default.txt enabling the build. Builds are
disabled while fixing or blacklisting autotests.

Task-number: QTQAINFRA-1299
Task-number: QTQAINFRA-1300
Change-Id: I0fde33c8028c7ded9d07e8d9cb0dcfb03d5db188
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-06-01 11:45:06 +00:00
Oswald Buddenhagen
b4b1bfe1a6 Adjust submodule branches
Change-Id: I9c6e8ecf1798041b1d2524cb80be936b56216e47
2018-06-01 13:33:15 +02:00
Qt Submodule Update Bot
6b243aa278 Update submodules on '5.11' in qt5
Change-Id: Ib58c5a24c0398483da71115e049f1cbcfa8732b9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-01 06:50:50 +00:00
Qt Submodule Update Bot
4dcb07d2d4 Update submodules on 'dev' in qt5
Change-Id: Ie192c2d52f48e81160a7dd328c6a01accb8a7ebe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-31 16:48:32 +00:00
Liang Qi
154c24cc4f Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-05-31 22:07:11 +00:00
Edward Welbourne
21a37fe009 Remove LGPL_EXCEPTION.txt
It became obsolete when we switched to LGPL3, as discussed on the developer
mailing list in April 2017.

Change-Id: I67913f46c81730ffdc0f56163e854fd7043b2514
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-05-31 05:58:21 +00:00
Liang Qi
0a2465bc30 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7502e49bc75f84b7fb2d4534181a2082fc939265
2018-05-30 21:19:11 +02:00
Qt Submodule Update Bot
feb12a86f8 Update submodules on 'dev' in qt5
Change-Id: I9039e373e97899ea9ec756e07b278ea8c1f20aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-30 16:48:29 +00:00
Qt Submodule Update Bot
e09cd7630f Update submodules on '5.11' in qt5
Change-Id: I695ecee66a9a0c256e6df2c68790cf3f9d58ac9a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-30 05:56:51 +00:00
Qt Submodule Update Bot
ff8efac616 Update submodules on 'dev' in qt5
Change-Id: Ib89eaa00e83cf0d124980660397a54aafc506196
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-29 07:48:01 +00:00
Qt Submodule Update Bot
7c3689778e Update submodules on '5.11' in qt5
Change-Id: Ib8dd64712bea33b7dffc46ea13bdd7c5239121cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-29 06:51:23 +00:00
Joni Jantti
e9faaf8239 Provisioning: Remove broken proxy setup from RTA 32-bit Windows 10
Currently the proxy disabling script on 32-bit Windows breaks the
internet settings, preventing browser usage for example.

Change-Id: I77282f0d929a6223ceafd3b648d2e2a7b16186c9
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-29 06:47:16 +00:00
Oliver Wolff
e57ef7c949 Update winrtrunner
A newer build of winrtrunner is needed. It is built from dev and
contains fixes related to handling of test output (most
importantly 044e9ad878ed1cf0ace0a9260b55cc94c71a294d).

To make the script more stable, the newer version of winrtrunner
was also copied to ci-files01, so that an alternative download
location can be offered.

Change-Id: I6a429aa3292266067756ce7ba3553088dc168197
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-05-28 11:38:29 +00:00
Qt Submodule Update Bot
f11b58d500 Update submodules on 'dev' in qt5
Change-Id: I5b5825abf17a302fde54efb7fb24684f3461b6dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-28 06:56:21 +00:00
Qt Submodule Update Bot
9ca1d1bf8f Update submodules on 'dev' in qt5
Change-Id: Ib7cdc0ff958af88d011c1db1a49e11f7378582d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-27 17:40:32 +00:00
Qt Submodule Update Bot
15ae235e51 Update submodules on '5.11' in qt5
Change-Id: Ic5b0846668d59b88e47e432dd692b569079e09a3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-27 17:06:00 +00:00
Qt Submodule Update Bot
6f6efe15fd Update submodules on '5.11' in qt5
Change-Id: I09f4b1a1c4d50f935f5d7c83fcab232d05630b68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-26 00:02:24 +00:00
Maurice Kalinowski
b317ad8096 Remove hardcoded download path
Previously all files got downloaded to a hardcoded path, including the
username for the CI machines. Usually, it does not fit the username of a
local development machine, complicating to reproduce bugs.

Introduce Get-(Default)DownloadLocation functions in helpers to
specify the default download location. This helps to run the
provisioning scripts on a local machine.

Change-Id: I761a92bf5e3e774358756a95dddb9a5d6ee54db9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-05-25 10:25:55 +00:00
Maurice Kalinowski
45709cec07 Provisioning: Update Open62541
Change-Id: I04d8dfed982c68efb83f28a2f34f8632e3a66312
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-05-25 07:32:00 +00:00
Maurice Kalinowski
d9fcbde41d Provisioning: Install Open62541 on Windows
Open62541 is one of the supported OPC UA backends in the Qt OpcUa
module.

Change-Id: I9baaffbae058d0590819e248694ee41887558708
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-05-25 06:45:00 +00:00
Qt Submodule Update Bot
7670e95e52 Update submodules on 'dev' in qt5
Change-Id: I4f192d544796443b3986393d386323791563918c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-25 06:44:56 +00:00
Qt Submodule Update Bot
275f53c681 Update submodules on '5.11' in qt5
Change-Id: Ide77625c853aa01db8e4d6e51bc7d693788884c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-25 06:43:46 +00:00
Qt Submodule Update Bot
32c5bc52ce Update submodules on '5.11' in qt5
Change-Id: I167745a5280f35ab02e81e4a55c87f779d3f1a1a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-24 16:04:51 +00:00
Qt Submodule Update Bot
8aa0d92d3d Update submodules on 'dev' in qt5
Change-Id: I2b45743807a8b4456e58756ecf7e4a8afa476b8f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-22 06:29:55 +00:00
Qt Submodule Update Bot
0cd3312bd4 Update submodules on '5.11' in qt5
Change-Id: I75e33acd5abd94893ba89acc249ef3808b04b06f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-22 00:01:29 +00:00
Simo Fält
2a27a539e7 Restore clang version 4.0 to RHEL 6.6
Libclang is required for Pyside to compile, so dropping it totally would
block Pyside development.

Change-Id: I9c0deb3f0457f97bc4c36179971d49d58ca244a6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-05-21 11:51:19 +00:00
Qt Submodule Update Bot
407d64d584 Update submodules on '5.11' in qt5
Change-Id: I1b7a7a9970f15669e9957a99b1f932e0ad22a209
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-21 08:25:13 +00:00
Qt Submodule Update Bot
9dbddbcc8e Update submodules on 'dev' in qt5
Change-Id: I3401f64d62d459c640c2e3239b09861a17f8a2f0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-21 08:25:01 +00:00
Qt Submodule Update Bot
3c3f50c015 Update submodules on 'dev' in qt5
Change-Id: I2e63b1e58332e29a6f229069756e1da6e5373709
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-20 09:16:33 +00:00
Qt Submodule Update Bot
b496b5f4d2 Update submodules on '5.11' in qt5
Change-Id: I3883afd4c1f626825e7c5741364f255862a2e512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-20 00:00:55 +00:00
Qt Submodule Update Bot
9dbf3d46ba Update submodules on '5.11' in qt5
Change-Id: I24c92fc659cbf40271b171ecf8179ffed14e5454
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-19 11:49:55 +00:00
Qt Submodule Update Bot
5b5f008526 Update submodules on 'dev' in qt5
Change-Id: I1de969915ada8d1915da4107ff7e4620340fb269
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-19 08:34:26 +00:00
Liang Qi
b6c915e4c5 Update submodules on '5.11' in qt5
Change-Id: I9398f42e940a4249e1fece564e51aa028e7f7464
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-18 21:30:50 +00:00
Liang Qi
a2b5c37d7a Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ifa6c63ef62e339b90e571b13c73addaa17d7af4e
2018-05-18 11:55:23 +02:00
Qt Submodule Update Bot
ea52430c66 Update submodules on '5.11' in qt5
Change-Id: I888cec01eaeab2b2029b172061d2ce07170faa97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-18 07:17:37 +00:00
Qt Submodule Update Bot
03138c3980 Update submodules on 'dev' in qt5
Change-Id: I4478023c65825d45085b3fe3bf77fda0a3bfe827
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-17 09:20:53 +00:00
Qt Submodule Update Bot
3a0c2b894c Update submodules on '5.11' in qt5
Change-Id: I9d3f11e5fa9df3a4596474312a2ffc0426e495c5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-17 07:20:03 +00:00
Liang Qi
9cc1220a43 Update submodules on '5.11' in qt5
Change-Id: Ib08b9121da4235621876f41686f2715f01db0b30
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-16 21:04:33 +00:00
Qt Submodule Update Bot
081601ba0e Update submodules on '5.11.0' in qt5
Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-16 14:32:45 +00:00
Qt Submodule Update Bot
f6f9bd6d93 Update submodules on 'dev' in qt5
Change-Id: Ia4432c50cba26e11284b74d5ea87d9a77b8da950
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-16 10:43:52 +00:00
Jędrzej Nowacki
54261be7c3 Remove RHEL 6 from the CI
RHEL7 was introduced to replace RHEL6, we do build packages on RHEL7
already. The only coverage that it adds is an old gcc, but in the same
time it is quite expensive to maintain because of generally old
software stack.

Change-Id: I9955747efecefc3354aa9e1f1c45f7d1bc48dfc6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-05-16 10:43:45 +00:00
Qt Submodule Update Bot
e7a999ce4d Update submodules on '5.11.0' in qt5
Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-16 09:14:15 +00:00
Qt Submodule Update Bot
426708026e Update submodules on '5.11' in qt5
Change-Id: Ia95638ce97e677ceeb0bfd85b287735b6027eeb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-15 12:50:30 +00:00
Qt Submodule Update Bot
defbea3929 Update submodules on 'dev' in qt5
Change-Id: I05469b85b7cf92b21ed9c3e82a89c116ff66abe0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-15 12:27:13 +00:00
Qt Submodule Update Bot
d7b03bf0bc Update submodules on '5.11.0' in qt5
Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-15 11:00:36 +00:00
Samuli Piippo
1c8ff381be Change QNX7 x86 release builds to x86_64
Task-number: QTBUG-67746
Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-15 06:13:26 +00:00
Simon Hausmann
d75411d6e5 Fix linking of qdoc against an external libclang (part 1)
This is the qt5 part of the fix for the task. For the special version of
libclang we hacked together that allows static linkage, set an
environment variable that the mighty qdoc build system can utilize to
activate the release packaging specific linkage.

Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9
Task-number: QTBUG-68178
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-05-14 12:30:59 +00:00
Qt Submodule Update Bot
e18e2b1a49 Update submodules on 'dev' in qt5
Change-Id: I046ebf51bbccb3e75275ba57fdf1c555d41ae6df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-14 09:32:33 +00:00
Qt Submodule Update Bot
36e5f25e56 Update submodules on '5.11' in qt5
Change-Id: Ia5f7391624235fe85ba4ee591ff7a9dacc380a61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-14 08:53:54 +00:00
Qt Submodule Update Bot
a32c6e3d8d Update submodules on 'dev' in qt5
Change-Id: I666fee90000d4a36d5f2acd47e43fd0d95d954b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-11 08:17:56 +00:00
Qt Submodule Update Bot
1f510d9514 Update submodules on '5.11' in qt5
Change-Id: I0bbfab039743e644b1acf3321bb900c4ad8a43f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-11 00:01:14 +00:00
Qt Submodule Update Bot
e77da9ecb3 Update submodules on 'dev' in qt5
Change-Id: Ie4e6177e118c2783723ca8c12fbab50be6044912
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-10 17:06:55 +00:00
Liang Qi
1e5cf1852a Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia167d4f873ed500e3bae798eade6720db6b21750
2018-05-10 12:38:49 +02:00
Qt Submodule Update Bot
f5ef436426 Update submodules on '5.11' in qt5
Change-Id: I7020e4048d61eec71f931da3fc12da2613d3dab8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-10 08:33:12 +00:00
Liang Qi
b1f1bf5560 Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ia252225aa1339ac448dd726b149e08739c02dfc5
2018-05-09 22:12:22 +02:00
Qt Submodule Update Bot
b1b04fcb1a Update submodules on '5.11.0' in qt5
Change-Id: Ia6d3ee44db368765612cea543952878499889d6b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-09 12:05:12 +00:00
Qt Submodule Update Bot
af8eab0993 Update submodules on 'dev' in qt5
Change-Id: I6cedb5c221711ed38323d4ba5a4b6cbd693f6c6c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-09 10:34:54 +00:00
Qt Submodule Update Bot
1989bc105d Update submodules on '5.11' in qt5
Change-Id: I0922b0b730ec0abd02d5940fdf6b3e7b1162baba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-09 07:43:10 +00:00
Qt Submodule Update Bot
f0dfbba994 Update submodules on 'dev' in qt5
Change-Id: I26fdc25d6a542dc6f0f4faeca0af84d171c491f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-08 17:52:30 +00:00
Rainer Keller
24eaf68a10 Provisioning: Remove freeopcua
Support for it is dropped

Change-Id: I574a50f279df9e390954e6dece4b947c8860038b
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-05-08 10:17:50 +00:00
Qt Submodule Update Bot
39a109c884 Update submodules on '5.11' in qt5
Change-Id: Ibfe4750bb82679e1a0366c77d74ef9491b642212
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-08 00:01:20 +00:00
Qt Submodule Update Bot
4d9ab7c72c Update submodules on '5.11' in qt5
Change-Id: I29efdec1b59ea7703481840aaaf4220778eace13
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-05 07:14:29 +00:00
Qt Submodule Update Bot
9819faba63 Update submodules on 'dev' in qt5
Change-Id: Ibcea46a3aafdbb3fc999be6c61b7c469b4a5ae68
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-05-04 18:26:17 +00:00
Qt Submodule Update Bot
8cd324b216 Update submodules on '5.11.0' in qt5
Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-04 18:21:18 +00:00
Qt Submodule Update Bot
ab7772a73d Update submodules on '5.11.0' in qt5
Change-Id: I37be73eba9442b56b5f7147e7d69b98ce464b44d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-03 15:42:55 +00:00
Qt Submodule Update Bot
c740458cd8 Update submodules on '5.11' in qt5
Change-Id: I3d5244647a09a02ed54879e3a79dbce7daa65460
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-03 05:47:55 +00:00
Tony Sarajärvi
80b8954591 Update openssl packages to 1.0.2o
Change-Id: Iab7043212cc3b66c26100519d95ac18fc69fa26a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:49 +00:00
Tony Sarajärvi
b1c3eeb213 Fix styles in setting proxy
Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:44 +00:00
Tony Sarajärvi
c7562fa8ef Take proxy into use in python provisioning in windows
Task-number: QTQAINFRA-1669
Change-Id: I2030f244da65e4fd0c3b0be54d941b065f9a180e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:40 +00:00
Qt Submodule Update Bot
f5af9f119b Update submodules on '5.11' in qt5
Change-Id: I9e2f1fdb7f746a96d5e78889c1a77741ed9f116c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-02 11:37:57 +00:00
Liang Qi
b49034df17 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: I59d364b4165766e33d6344f7b3e10f0bc79c7442
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-02 07:14:39 +00:00
Simon Hausmann
41369b6282 Install the MinGW build of libclang
This restores the MinGW installation of libclang on Windows 7 and
installs the MSVC and MinGW builds in parallel on Windows 10. For
compatibility reasons the MSVC installation is done last, to ensure that
the older LLVM_INSTALL_DIR variable points to the MSVC installation. In
addition though we now get LLVM_INSTALL_DIR_MINGW and
LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the
future.

Task-number: QTBUG-66015
Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-05-01 06:34:05 +00:00
Liang Qi
6840a639ec Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I02bb2ecd3b1121255d885082023f24412284b445
2018-04-29 20:25:03 +02:00
Tony Sarajärvi
889cdbf4a8 Fix shellcheck complaints for RHEL 7.x in provisioning scripts
Change-Id: I489f4f25d603457c8f0444ed277a162a7fd4128f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 16:12:00 +00:00
Joni Jantti
7a018aeb8b Provisioning: Add a clean Ubuntu 16.04 x86
A clean ubuntu 16.04 provisioning is required by RTA.

Task-number: QTQAINFRA-1640
Change-Id: I83f53c7b677da6d1aa0e89cc6bde0b2363a7ae1e
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:21:10 +00:00
Oliver Wolff
8d04f876e7 windows provisioning: Do not use Windows builtin way of extracting zips
The builtin way of Windows for handling zip files is much slower than
using 7zip. A small benchmark (not representative, just extracting the
android ndk) showed 11 minutes using Extract-Zip vs 2,5 minutes using
Extract-7Zip on my machine.

Change-Id: I5198aabb5b75860ead687581fc5e368eb75e48ae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-29 13:21:05 +00:00
Heikki Halmet
e3699c5a6f Add missing sw versions to versions.txt
Change-Id: Ifa12b6c6308e4ad73989e7e935061f77ae1823e2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-29 13:21:01 +00:00
Joni Jantti
93e31c1281 Provisioning: Ubuntu - zlib1g:i386
RTA needs this package for QNX testing.

Task-number: QTQAINFRA-1930
Change-Id: I3587558bc1c8ece6dbb29b5f5184f4bfa744a790
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-29 13:20:55 +00:00
Tony Sarajärvi
ce1479c1d3 Provisioning: list installed packages in distro
Change-Id: I71bbfbfba034066cffd4cb1a9d781d386b1b6b9a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:51 +00:00
Tony Sarajärvi
d93baa38d0 Fix powershell stylings in provisioning scripts
Change-Id: I946027047b9810ec1197b50394f157eb406434c2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-04-29 13:20:48 +00:00
Tony Sarajärvi
cd87f148dd Fix Squish Provisioning coding style
Change-Id: I663ce38fffa3a9446972d1790d80f76b7155c029
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:44 +00:00
Tony Sarajärvi
b8c0fb552f Fix and-or in NTP disabling
Change-Id: Ib4b6ffa65ba600919ad71b2748da5055449f3164
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-29 13:20:40 +00:00
Tony Sarajärvi
5586a17eff Fix shellcheck complaints for openSUSE provisioning scripts
Change-Id: I5360a1b7b4c405d7ca9fedee8e100d933ec6e7b7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:36 +00:00
Tony Sarajärvi
eccb53c607 Fix shellcheck complaints in common macos provisioning scripts
Change-Id: I9d6891a2956f66ebf2ca759c4085acad30a84618
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:32 +00:00
Tony Sarajärvi
9bf79e6bab Fix shellcheck complaints in provisioning scripts
Change-Id: I38306c6d2ff360dc12f8c33b289bbc4ae4935aca
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:29 +00:00
Liang Qi
cddb2254c3 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: I26bdf0fefb782f3f93c6674ebf183ce1dd6e13e6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 09:38:15 +00:00
Liang Qi
c17c6f224c Update submodules on 'dev' in qt5
qtdeclarative was switched back to 913dc3f4f2be7c2c23237bcb9bffb3192cb10d60
due to sick coin integration.

Change-Id: I3defce1fb1f2ca86c85ada2605b351bf48668082
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 06:32:52 +00:00
Qt Submodule Update Bot
1125bbae42 Update submodules on '5.11' in qt5
Change-Id: I342c23fe566e1f2d8bf1aab24a7b9c6c47ea82fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-28 20:10:13 +00:00
Qt Submodule Update Bot
d14d8f0cac Update submodules on '5.11.0' in qt5
Change-Id: If2f1f76270195f337803ba302e46049acb015e3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-28 16:22:40 +00:00
Qt Submodule Update Bot
5cc5f606a9 Update submodules on '5.11.0' in qt5
Change-Id: Ica9fca497f78dd4660118814acce3a4c2c0e68b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-28 11:59:13 +00:00
Jędrzej Nowacki
c5ddbdb86b Update clang version to 6.0
The version also contains statically compiled libraries so we can
ship qdoc without shipping libclang.

The change temporarly removes CI qdoc builds from RHEL6 and MinGW,
these two configurations are not used for packaging, just for CI
testing. We should restore MinGW later.

Task-number: QTBUG-66015
Task-number: QTBUG-67764
Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Fredrik de Vibe <fredrik.devibe@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-28 11:59:06 +00:00
Qt Submodule Update Bot
e48317193f Update submodules on '5.11' in qt5
Change-Id: I33004fcf26af40c9f17315a8aa5e66b22cc5f6ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-27 07:31:55 +00:00
Qt Submodule Update Bot
a809b77965 Update submodules on 'dev' in qt5
Change-Id: I17e0dbd8ba367b310f391daacc427a66051fb75a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-26 04:55:13 +00:00
Liang Qi
c4d98c8dd1 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie540fd9391b53aa249c1c46bf1089575572612de
2018-04-25 20:14:43 +02:00
Gatis Paeglis
8115be2811 Provisioning: Ubuntu - remove Unity window decorations
Unity does not respect setGeometry() call, which is
violation of WM spec. During the years we have tried
various workarounds, but it has proved to be counterproductive.

This patch adjusts Unity theme to not draw window decorations,
ensuring that Unity treats the setGeometry() call the same way
all the other WMs and platforms we are testing on.

For more detailed explanation see QTBUG-67757.

Task-number: QTBUG-67757
Change-Id: I8d2bb9f2af14d3c184fc218ed08a1febd70f4026
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2018-04-25 05:48:35 +00:00
Liang Qi
13051ee1d2 Update submodules on '5.11' in qt5
Change-Id: Ifc4c66653fe08abaee02e743ba947170b20f5acc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-25 05:48:31 +00:00
Liang Qi
4442b551be Update submodules on 'dev' in qt5
Change-Id: If80bed6e4c0a484f2366deeb59d3b133f0850db6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-25 05:42:52 +00:00
Qt Submodule Update Bot
0e870f5594 Update submodules on '5.11.0' in qt5
Change-Id: I16b8e45bd4dff9470299aced9fdf5302878f61f8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-24 19:43:11 +00:00
Liang Qi
38e6ddc9ee Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Ida278c6731466e7de8c9dc9115a948488869a746
2018-04-20 15:29:36 +02:00
Qt Submodule Update Bot
60dd5ad451 Update submodules on 'dev' in qt5
Change-Id: I462316f021624950e61ae38aceee90b49600816f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-20 10:33:52 +00:00
Qt Submodule Update Bot
2671e05023 Update submodules on '5.11.0' in qt5
Change-Id: Ie95476e1e3f240b8a55da79b09c65736f240272e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-18 17:16:53 +00:00
Qt Submodule Update Bot
5aca8f9e5e Update submodules on 'dev' in qt5
Change-Id: Ic476ef7434eb7911177d95618094d7972d0f6203
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-17 21:49:19 +00:00
Topi Reinio
795981e720 Provisioning: openSUSE-42.3: Install libpulse-devel
Required by Qt Multimedia.

Task-number: QTBUG-64538
Change-Id: I12e5a1b1a6390f553d883ce12647475eb9dd2992
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-17 16:43:53 +00:00
Liang Qi
4d4159f7b7 Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Id0540cee408413b7f5ab7410f3d1db3f38fd46af
2018-04-17 14:15:23 +02:00
Liang Qi
9a8c6faf26 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8bb29f5e2edfbee3df2388712137cfd7f31aa3aa
2018-04-16 10:40:51 +02:00
Qt Submodule Update Bot
7f937b6d94 Update submodules on 'dev' in qt5
Change-Id: I54baff3ba462cfcab812bf3a97378a1f2b169a49
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-16 03:59:53 +00:00
Simo Fält
6a06c4b4fe Revert "Install Python 2.7.13 to RHEL with pip"
This reverts commit 794913dde7,
which seems to break pyside builds. Instead we install python-pip
package from the EPEL repository.

Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-16 03:32:20 +00:00
Liang Qi
1567d66269 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I299251ffa3bf10346d0d99abe02b14d7af5b5860
2018-04-15 19:13:55 +02:00
Qt Submodule Update Bot
6c8307abf6 Update submodules on '5.11' in qt5
Change-Id: I18750ffb5810a3f60a2b615ca487ce42459d560d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 16:41:22 +00:00
Heikki Halmet
83f2a25f17 Provisioning: Add test for squish installation
Squish is needed by RTA which is not run during normal qt5 build. Other
words squish installation is not tested during integration. That's why
we need separate test for it.
This change will fetch test and run test suite which is made to check
that squish installation works

Task-number: QTQAINFRA-1733
Change-Id: I9284fd52d87767ae04022c3a6996e0bb972315dd
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-15 16:41:18 +00:00
Joni Jantti
e8a60ed41b Provisioning: Ubuntu - Add QNX 6.6.0
QNX 6.6.0 is required by RTA.

Task-number: QTQAINFRA-1914
Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:13 +00:00
Joni Jantti
c404097600 Provisioning: Win10_x86 - mysql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I13d78da0bd3ea2fa8a75734fb5f88a472cbd79de
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:08 +00:00
Joni Jantti
3d6736a7f1 Provisioning: Win10_x86 - openssl
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I4937980a1f23d56e509b71541605c80cb6423402
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:04 +00:00
Joni Jantti
c1e2307d02 Provisioning: Win10_x86 - psql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: Ia13d9586d1c1934c8c4e51fcbe9ce826bba68524
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:00 +00:00
Joni Jantti
081861de18 Provisioning: Win10_x86 - Windows 10 SDK with debugging tools
RTA needs debugging tools for Windows 10 x86 testing.

Change-Id: I69cae92a2529a933a018f22c1b200bdc4d2c0aa0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:40:57 +00:00
Tony Sarajärvi
8375a33d4a Fix squish provisioning script typo
Change-Id: If33847a552fe40128cef577b99adf3152de3a9e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-15 16:40:53 +00:00
Tony Sarajärvi
cd347c86af Fix shellcheck complaints in RHEL 6.6 provisioning scripts
Change-Id: Idb4240b4cfd309b2c6c418e8c18b175a491f8eea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-15 16:40:49 +00:00
Liang Qi
6df84f8984 Update submodules on '5.11' in qt5
Change-Id: I5b4c4043f2bfb2bf3e62bc06e244a4fec3e5bbd6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 05:55:49 +00:00
Heikki Halmet
cfc44559ef Provisioning: Install Git Large File Storage
This tool is needed to clone some repositories correctly

Task-number: QTQAINFRA-1921
Change-Id: If4744304490649aeecf9daa0c1f840ded9b7beed
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-04-15 05:55:45 +00:00
Heikki Halmet
f9e9dd1393 Provisioning: Use wayland libs provided by distro
Redhat repositories includes needed wayland
libraries. Let's use those instead providing
those through provisioning.


Task-number: QTQAINFRA-1925
Change-Id: I543a6b9fb8876f64d4b9c17ef909b9c61129e62e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:42 +00:00
Heikki Halmet
ba30e967d0 Provisioning: Set ssh key and configurations for Yocto build
Task-number: QTQAINFRA-1888
Change-Id: I2dd01080998866ce2affd6a5aea797540f28db19
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:39 +00:00
Heikki Halmet
2e6af2bba7 Provisioning: Upgrade pip to latest version
Latest pip version is not installed during python
installation. Pip need to be reinstalled after python
installation because older version of pip seems to cause
installation problems randomly at least with python 2.7

Task-number: QTQAINFRA-1902
Change-Id: If3d74130ecee6e410c64cad309feff9edc0e5db0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:35 +00:00
Heikki Halmet
c79d285ffa Provisioning: Remove sha1 file after shasum check
Change-Id: Iee8e66d98e5ebd2dee18baf8e1752a86065417d1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:32 +00:00
Qt Submodule Update Bot
f728979975 Update submodules on 'dev' in qt5
Change-Id: I963065f0eca222056e025ec9fd86f4929b43e662
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-15 05:50:05 +00:00
Simon Hausmann
847cbbd869 Remove qtenginio
The module has been dead for a while as well as the corresponding
service.

Change-Id: I40ce39f18d32be7ae22e944dcd181a7d7c0cfce5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-13 10:45:53 +00:00
Oswald Buddenhagen
24e1a15d40 Adjust submodule branches
Change-Id: Ic069e5dedce639cb1c17df06ee43e87eacc139d8
2018-04-12 14:07:13 +02:00
Qt Submodule Update Bot
73be04a169 Update submodules on 'dev' in qt5
Change-Id: Ifec2d71b764805946eff7ddfefb8cf439c07e9bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-12 05:12:14 +00:00
Qt Submodule Update Bot
2074cadecd Update submodules on '5.11' in qt5
Change-Id: Ibfd10c0da7c86f52a860cd39776519c9d4ab4b61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-11 05:44:38 +00:00
Qt Submodule Update Bot
7ae52b78e4 Update submodules on 'dev' in qt5
Change-Id: I8f4b1e5069782dc9269d1510f08a0e252cc5f9b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-10 20:35:16 +00:00
Liang Qi
9b584a8117 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
2018-04-10 15:04:06 +02:00
Liang Qi
5abe434755 Update submodules on 'dev' in qt5
Change-Id: Ia35c5a575635a4c02f209822501bf7dd71351f87
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-10 10:46:52 +00:00
Qt Submodule Update Bot
1616d89eea Update submodules on '5.11' in qt5
Change-Id: I71ed7dbae2d7071e9c16a6e24979174b1b75d640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-10 08:31:14 +00:00
Qt Submodule Update Bot
69841b3e9a Update submodules on 'dev' in qt5
Change-Id: Ie17a34259d7a1ba39f341a915d95901a1a9e7499
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-07 12:50:36 +00:00
Qt Submodule Update Bot
2171fc5840 Update submodules on 'dev' in qt5
Change-Id: Idbf93b4fc080fc6921a6e91822650c9d7520d6c8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-05 21:21:15 +00:00
Liang Qi
98daaeac6c Update submodules on 'dev' in qt5
Skip qtbase in this round for QTBUG-67371.

Change-Id: I95034ff9451b4c1fbfc8d820d0af365dddb63cdf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-03 06:41:52 +00:00
Liang Qi
e27f168cd9 Update submodules on 'dev' in qt5
Skip qtbase in this round for QTBUG-67371.

Change-Id: I1d3fe67288fb4ed3a02233cab9502be8ba543129
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-29 07:28:37 +00:00
Qt Submodule Update Bot
787af82934 Update submodules on 'dev' in qt5
Change-Id: I9bbfda518eb65d33c6b70bebc8e57f6e24ab79ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-26 08:27:48 +00:00
Qt Submodule Update Bot
c04f645472 Update submodules on 'dev' in qt5
Change-Id: I704b7ec298f4669b21bc2678c34f15b69d143c24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-25 05:51:29 +00:00
Jani Heikkinen
4eeb6ba0bb Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-23 05:14:26 +00:00
Qt Submodule Update Bot
63787a03e4 Update submodules on 'dev' in qt5
Change-Id: I3926d3b14d2e258e5418c2fb65db89932a62795b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-23 05:14:20 +00:00
Liang Qi
81835942b5 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If72681a7d994b784c8b17fa0f9bafaef722f27d3
2018-03-22 10:06:22 +01:00
Jani Heikkinen
46dcec5ecc Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-21 05:08:32 +00:00
Qt Submodule Update Bot
3bd7671a97 Update submodules on 'dev' in qt5
Change-Id: If894a58424fae08b0648cd54d38adf6faf847e26
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-21 05:08:28 +00:00
Liang Qi
4b18389605 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iecb1db823736ed8eba450cbe1df1e5d0f46bbc7a
2018-03-20 11:32:45 +01:00
Qt Submodule Update Bot
9d4fdf373f Update submodules on 'dev' in qt5
Change-Id: If5f921f7296d09f855eccec24ceed0ba880c5cda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-20 10:05:20 +00:00
Jani Heikkinen
7dbaf0c651 Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-19 05:04:32 +00:00
Qt Submodule Update Bot
a41519ddf9 Update submodules on 'dev' in qt5
Change-Id: I8de17a2a29f1190a819d6a461f0d2b4c416641a4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-19 05:04:27 +00:00
Liang Qi
26cf8950b8 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I6538504713bee35853419f14a110af1ba2a6b1e9
2018-03-18 19:01:17 +01:00
Qt Submodule Update Bot
5533acdd78 Update submodules on 'dev' in qt5
Change-Id: I9b7acbf67f6af2e95db87585dcc70f4aecc5d503
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-18 09:13:24 +00:00
Qt Submodule Update Bot
7f4f29ab95 Update submodules on 'dev' in qt5
Change-Id: I2f90804140d6e15fc7c3e829a7b6c86611a496d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-17 19:36:15 +00:00
Qt Submodule Update Bot
9bb3cde706 Update submodules on 'dev' in qt5
Change-Id: Icf3d9d788c45f93e6dbfc973d4cb6df6a66243cd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-15 06:17:16 +00:00
Qt Submodule Update Bot
573e4d5633 Update submodules on 'dev' in qt5
Change-Id: Iba60f4bbbfee4d7b0a14cac1ff36b03cb1c73c3f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-14 05:14:51 +00:00
Qt Submodule Update Bot
69dd54a8dc Update submodules on 'dev' in qt5
Change-Id: I4f2eee96b5ca23177816861cca3eb7ac0ea5e515
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-11 12:28:25 +00:00
Liang Qi
ec45725ef2 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1c443b44c8ebe41b84ca5bbbb9dc8884a8fdfa8a
2018-03-10 17:08:46 +01:00
Qt Submodule Update Bot
d6d6318e98 Update submodules on 'dev' in qt5
Change-Id: Ia305f8493404ed258de43504a440c9cd5b2eac90
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-27 16:51:08 +00:00
Liang Qi
0f22ce6a71 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I45b92cefd7f14bbe99a6fa2d31b8d14bb41da21a
2018-02-27 11:27:21 +01:00
Qt Submodule Update Bot
20b1d0a54b Update submodules on 'dev' in qt5
Change-Id: Ic951b2a9e44e299bedc4c6dc561d8f9e17de6544
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-26 09:54:33 +00:00
Liang Qi
36d5e1a794 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie83ca342acce563e85620c3998ae7e9f74a7c4bc
2018-02-23 22:16:13 +01:00
Qt Submodule Update Bot
b17fcbe630 Update submodules on 'dev' in qt5
Change-Id: Ia6f8ec8bb3361419f6d50dbddb665e974a2f1fca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-23 09:08:49 +00:00
Liang Qi
238cb26099 Update submodules on 'dev' in qt5
Change-Id: Ia8de2d8c35a6a021fd22522a642caa82d960aed2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-23 06:31:08 +00:00
Liang Qi
93ff678878 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib867a3e53f624b8963e6dab311fe5c2a28c87801
2018-02-21 09:57:48 +01:00
Liang Qi
c152f646db Update submodules on 'dev' in qt5
Change-Id: Icbb7b51a46c55ed4ec7690e6cdceedf4680f3b2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-14 06:54:00 +00:00
Liang Qi
3d445e8b77 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iac3ddede9c1d6b0de5a30b3490d5564995afaabc
2018-02-13 21:18:24 +01:00
Qt Submodule Update Bot
9cb9e7654a Update submodules on 'dev' in qt5
Change-Id: Ibb42cbf10eb51d99e5d26a3e616bf488f9b5bd28
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 05:26:25 +00:00
Qt Submodule Update Bot
623528bf40 Update submodules on 'dev' in qt5
Change-Id: Id7d9342393bbf3068dd7a1c90dc2afe365d80962
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-11 19:13:43 +00:00
Qt Submodule Update Bot
a969ebdb84 Update submodules on 'dev' in qt5
Change-Id: If9edf8eca3865c32db056bb8f167dc47530c9d37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:38 +00:00
Qt Submodule Update Bot
f50cada914 Update submodules on 'dev' in qt5
Change-Id: I712f991abb4fb97e341133c295f2d77330a84a68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 13:14:52 +00:00
Qt Submodule Update Bot
25a19a1115 Update submodules on 'dev' in qt5
Change-Id: I29aba3e5aebc6ee4b2e130b70dbf184ad3d79303
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-08 07:30:24 +00:00
Oswald Buddenhagen
9c506a5164 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
2018-02-07 20:17:09 +01:00
Qt Submodule Update Bot
9680fa7860 Update submodules on 'dev' in qt5
Change-Id: If34630f163416a6ee7b34df5b7f41c47f8f5cfd1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 18:34:51 +00:00
Liang Qi
da1189b867 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Icf5a559c89f572249cc1fd54d2c11319597afdf9
2018-02-07 10:14:50 +01:00
277 changed files with 3996 additions and 1533 deletions

View File

@@ -9,7 +9,11 @@
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
# One task per entry. Remember space after colon.
# One task per entry. Add a space after the colon.
# Use Fixes to automatically close an issue, and Task-number to
# reference it without further action.
# You do not need both for the same issue.
#Fixes:
#Task-number:
#Coverity-Id:
#

111
.gitmodules vendored
View File

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

View File

@@ -1,22 +0,0 @@
The Qt Company Qt LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.

View File

@@ -1,628 +0,0 @@
TECHNOLOGY PREVIEW LICENSE AGREEMENT
For individuals and/or legal entities resident in the Americas (North
America, Central America and South America), the applicable licensing
terms are specified under the heading "Technology Preview License
Agreement: The Americas".
For individuals and/or legal entities not resident in The Americas, the
applicable licensing terms are specified under the heading "Technology
Preview License Agreement: Rest of the World".
TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
Agreement version 2.4
This Technology Preview License Agreement ("Agreement")is a legal agreement
between Digia USA, Inc. ("Digia"), with its registered office at 2350
Mission College Blvd., Suite 1020, Santa Clara, California 95054,
U.S.A. and you (either an individual or a legal entity) ("Licensee") for the
Licensed Software (as defined below).
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be governed by and construed in accordance with the
federal laws of the United States of America and the internal laws of
the State of New York without given effect to any choice of law rule
that would result in the application of the laws of any other
jurisdiction. The United Nations Convention on Contracts for the
International Sale of Goods (CISG) shall not apply. Each Party (a)
hereby irrevocably submits itself to and consents to the jurisdiction of
the United States District Court for the Southern District of New York
(or if such court lacks jurisdiction, the state courts of the State of
New York) for the purposes of any action, claim, suit or proceeding
between the Parties in connection with any controversy, claim, or
dispute arising out of or relating to this Agreement; and (b) hereby
waives, and agrees not to assert by way of motion, as a defense or
otherwise, in any such action, claim, suit or proceeding, any claim that
is not personally subject to the jurisdiction of such court(s), that the
action, claim, suit or proceeding is brought in an inconvenient forum or
that the venue of the action, claim, suit or proceeding is improper.
Notwithstanding the foregoing, nothing in this Section 9.6 is intended
to, or shall be deemed to, constitute a submission or consent to, or
selection of, jurisdiction, forum or venue for any action for patent
infringement, whether or not such action relates to this Agreement.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.
TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World
Agreement version 2.4
This Technology Preview License Agreement ("Agreement") is a legal
agreement between Digia Finland Ltd ("Digia"), with its registered office at
Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a
legal entity) ("Licensee") for the Licensed Software.
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be construed and interpreted in accordance with the
laws of Finland, excluding its choice of law provisions. Any disputes
arising out of or relating to this Agreement shall be resolved in
arbitration under the Rules of Arbitration of the Chamber of Commerce of
Helsinki, Finland. The arbitration tribunal shall consist of one (1), or
if either Party so requires, of three (3), arbitrators. The award shall
be final and binding and enforceable in any court of competent
jurisdiction. The arbitration shall be held in Helsinki, Finland and the
process shall be conducted in the English language.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.

View File

@@ -0,0 +1,913 @@
QT LICENSE AGREEMENT
Agreement version 4.0
This License Agreement ("Agreement") is a legal agreement between The Qt
Company (as defined below) and the Licensee (as defined below) for the license
of Licensed Software (as defined below). Capitalized terms used herein are
defined in Section 1.
WHEREAS:
(A). Licensee wishes to use the Licensed Software for the purpose of developing
and distributing Applications and/or Devices; and
(B). The Qt Company is willing to grant the Licensee a right to use Licensed
Software for such purpose pursuant to term and conditions of this Agreement.
NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS:
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or indirectly
controlling such Party; (ii) which is under the same direct or indirect
ownership or control as such Party; or (iii) which is directly or indirectly
owned or controlled by such Party. For these purposes, an entity shall be
treated as being controlled by another if that other entity has fifty percent
(50 %) or more of the votes in such entity, is able to direct its affairs
and/or to control the composition of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software, which may include the Redistributables, or part
thereof.
"Contractor(s)" shall mean third party consultants, distributors and
contractors performing services to a Party under applicable contractual
arrangement.
"Customer(s)" shall mean Licensee's end users to whom Licensee, directly or
indirectly, distributes copies of the Redistributables.
"Deployment Platforms" shall mean operating systems specified in the License
Certificate, in which the Redistributables can be distributed pursuant to the
terms and conditions of this Agreement.
"Designated User(s)" shall mean the employee(s) of Licensee or Licensee's
Affiliates acting within the scope of their employment or Licensee's
Contractors acting within the scope of their services for Licensee and on
behalf of Licensee. Designated Users shall be named in the License Certificate.
"Development License" shall mean the license needed by the Licensee for each
Designated User to use the Licensed Software under the license grant described
in Section 3.1 of this Agreement.
"Development Platforms" shall mean those operating systems specified in the
License Certificate, in which the Licensed Software can be used under the
Development License, but not distributed in any form or used for any other
purpose.
"Devices" shall mean hardware devices or products that 1) are manufactured
and/or distributed by the Licensee or its Affiliates or Contractors, and
(2)(i) incorporate or integrate the Redistributables or parts thereof; or (ii)
do not incorporate or integrate the Redistributables at the time of
distribution, but where, when used by a Customer, the main user interface or
substantial functionality of such device is provided by Application(s) or
otherwise depends on the Licensed Software.
"Distribution License(s)" shall mean the license required for distribution of
Redistributables in connection with Devices pursuant to license grant described
in Section 3.3 of this Agreement.
"Distribution License Packs" shall mean set of prepaid Distribution Licenses
for distribution of Redistributables, as defined in The Qt Company's standard
price list, quote, Purchase Order confirmation or in an appendix hereto,
as the case may be.
"Intellectual Property Rights" shall mean patents (including utility models),
design patents, and designs (whether or not capable of registration), chip
topography rights and other like protection, copyrights, trademarks, service
marks, trade names, logos or other words or symbols and any other form of
statutory protection of any kind and applications for any of the foregoing as
well as any trade secrets.
"License Certificate" shall mean a certificate generated by The Qt Company for
each Designated User respectively upon them downloading the licensed Software.
License Certificate will be available under respective Designated User's Qt
Account at account.qt.io and it will specify the Designated User, the
Development Platforms, Deployment Platforms and the License Term. The terms of
the License Certificate are considered part of this Agreement and shall be
updated from time to time to reflect any agreed changes to the foregoing terms
relating to Designated User's rights to the Licensed Software.
"License Fee" shall mean the fee charged to the Licensee for rights granted
under the terms of this Agreement.
"License Term" shall mean the agreed validity period of the Development
License of the respective Designated User, during which time the
Designated User is entitled to use the Licensed Software, as set forth in the
respective License Certificate.
"Licensed Software" shall mean all versions of the
(i) Qt Toolkit (including Qt Essentials, Qt Add-Ons and Value-Add modules) as
described in http://doc.qt.io/qt-5/qtmodules.html,
(ii) Qt Creator (including Creator IDE tool) as described in
http://doc.qt.io/qtcreator/index.html,
(iii) Qt 3D Studio as described in http://doc.qt.io/qt3dstudio/index.html, and
as well as corresponding online or electronic documentation, associated media
and printed materials, including the source code, example programs and the
documentation, licensed to the Licensee under this Agreement. Licensed Software
does not include Third Party Software (as defined in Section 4), Open Source
Qt, or other software products of The Qt Company (for example Qt Safe Renderer
and Qt for Automation), unless such other software products of The Qt Company
are separately agreed in writing to be included in scope of the Licensed
Software.
"Licensee" shall mean the individual or legal entity that is party to this
Agreement, as identified on the signature page hereof.
"Licensee's Records" shall mean books and records that are likely to contain
information bearing on Licensee's compliance with this Agreement or the
payments due to The Qt Company under this Agreement, including, but not limited
to: assembly logs, sales records and distribution records.
"Modified Software" shall have the meaning as set forth in Section 2.3.
"Online Services" shall mean any services or access to systems made available
by The Qt Company to the Licensee over the Internet relating to the Licensed
Software or for the purpose of use by the Licensee of the Licensed Software or
Support. Use of any such Online Services is discretionary for the Licensee and
some of them may be subject to additional fees.
"Open Source Qt" shall mean the non-commercial Qt computer software products,
licensed under the terms of the GNU Lesser General Public License, version
2.1 or later ("LGPL") or the GNU General Public License, version 2.0 or later
("GPL"). For clarity, Open Source Qt shall not be provided nor governed under
this Agreement.
"Party" or "Parties" shall mean Licensee and/or The Qt Company.
"Redistributables" shall mean the portions of the Licensed Software set forth
in Appendix 1, Section 1 that may be distributed pursuant to the terms of this
Agreement in object code form only, including any relevant documentation.
Where relevant, any reference to Licensed Software in this Agreement shall
include and refer also to Redistributables.
"Renewal Term" shall mean an extension of previous License Term as agreed
between the Parties.
"Submitted Modified Software" shall have the meaning as set forth in
Section 2.3.
"Support" shall mean standard developer support that is provided by The Qt
Company to assist Designated Users in using the Licensed Software in
accordance with The Qt Company's standard support terms and as further
defined in Section 8 hereunder.
"Taxes" shall have the meaning set forth in Section 10.5.
"Term" shall have the meaning set forth in Section 12.
"The Qt Company" shall mean:
(i) in the event Licensee is an individual residing in the United States or a
legal entity incorporated in the United States or having its headquarters in
the United States, The Qt Company Inc., a Delaware corporation with its office
at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, USA.; or
(ii) in the event the Licensee is an individual residing outside of the United
States or a legal entity incorporated outside of the United States or having
its registered office outside of the United States, The Qt Company Ltd., a
Finnish company with its registered office at Bertel Jungin aukio D3A, 02600
Espoo, Finland.
"Third Party Software " shall have the meaning set forth in Section 4.
"Updates" shall mean a release or version of the Licensed Software containing
bug fixes, error corrections and other changes that are generally made
available to users of the Licensed Software that have contracted for Support.
Updates are generally depicted as a change to the digits following the decimal
in the Licensed Software version number. The Qt Company shall make Updates
available to the Licensee under the Support. Updates shall be considered as
part of the Licensed Software hereunder.
"Upgrades" shall mean a release or version of the Licensed Software containing
enhancements and new features and are generally depicted as a change to the
first digit of the Licensed Software version number. In the event Upgrades are
provided to the Licensee under this Agreement, they shall be considered as
part of the Licensed Software hereunder.
2. OWNERSHIP
2.1 Ownership of The Qt Company
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and treaties.
The Licensed Software is licensed, not sold.
All The Qt Company's Intellectual Property Rights are and shall remain the
exclusive property of The Qt Company or its licensors respectively.
2.2 Ownership of Licensee
All the Licensee's Intellectual Property Rights are and shall remain the
exclusive property of the Licensee or its licensors respectively.
All Intellectual Property Rights to the Modified Software, Applications and
Devices shall remain with the Licensee and no rights thereto shall be granted
by the Licensee to The Qt Company under this Agreement (except as set forth in
Section 2.3 below).
2.3 Modified Software
Licensee may create bug-fixes, error corrections, patches or modifications to
the Licensed Software ("Modified Software"). Such Modified Software may break
the source or binary compatibility with the Licensed Software (including
without limitation through changing the application programming interfaces
("API") or by adding, changing or deleting any variable, method, or class
signature in the Licensed Software and/or any inter-process protocols, services
or standards in the Licensed Software libraries). To the extent that Licensee's
Modified Software so breaks source or binary compatibility with the Licensed
Software, Licensee acknowledges that The Qt Company's ability to provide
Support may be prevented or limited and Licensee's ability to make use of
Updates may be restricted.
Licensee may, at its sole and absolute discretion, choose to submit Modified
Software to The Qt Company ("Submitted Modified Software") in connection with
Licensee's Support request, service request or otherwise. In the event Licensee
does so, then, Licensee hereby grants The Qt Company a sublicensable,
assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and
fully paid-up license, under all of Licensee's Intellectual Property Rights, to
reproduce, adapt, translate, modify, and prepare derivative works of, publicly
display, publicly perform, sublicense, make available and distribute such
Submitted Modified Software as The Qt Company sees fit at its free and absolute
discretion.
3. LICENSES GRANTED
3.1 Development with Licensed Software
Subject to the terms of this Agreement, The Qt Company grants to Licensee a
personal, worldwide, non-exclusive, non-transferable license, valid for the
License Term, to use, modify and copy the Licensed Software by Designated Users
on the Development Platforms for the sole purposes of designing, developing,
demonstrating and testing Application(s) and/or Devices, and to provide thereto
related support and other related services to end-user Customers.
Licensee may install copies of the Licensed Software on an unlimited number of
computers provided that (i) only the Designated Users may use the Licensed
Software, and (ii) all Designated Users must have a valid Development License
to use Licensed Software.
Licensee may at any time designate another Designated User to replace a then-
current Designated User by notifying The Qt Company in writing, provided that
any Designated User may be replaced only once during any six-month period.
Upon expiry of the initially agreed License Term, the respective License Terms
shall be automatically extended to one or more Renewal Term(s), unless and
until either Party notifies the other Party in writing that it does not wish to
continue the License Term, such notification to be provided to the other Party
no less than ninety (90) days before expiry of the respective License Term.
Unless otherwise agreed between the Parties, Renewal Term shall be of equal
length with the initial Term.
Any such Renewal Term shall be subject to License Fees agreed between the
Parties or, if no advance agreement exists, subject to The Qt Company's
standard pricing applicable at the commencement date of any such Renewal Term.
3.2 Distribution of Applications
Subject to the terms of this Agreement, The Qt Company grants to Licensee a
personal, worldwide, non-exclusive, non-transferable, revocable (for cause
pursuant to this Agreement) right and license, valid for the Term, to
(i) distribute, by itself or through its Contractors, Redistributables as
installed, incorporated or integrated into Applications for execution on the
Deployment Platforms, and
(ii) grant sublicenses to Redistributables, as distributed hereunder, for
Customers solely for Customer's internal use and to the extent necessary in
order for the Customers to use the Applications for their respective intended
purposes.
Right to distribute the Redistributables as part of an Application as provided
herein is not royalty-bearing but is conditional upon the Licensee having paid
the agreed Development Licenses from The Qt Company before distributing any
Redistributables to Customers.
3.3 Distribution of Devices
Subject to the terms of this Agreement, The Qt Company grants to Licensee a
personal, worldwide, non-exclusive, non-transferable, revocable (for cause
pursuant to this Agreement) right and license, valid for the Term, to
(i) distribute, by itself or through one or more tiers of Contractors,
Redistributables as installed, incorporated or integrated, or intended to be
installed, incorporated or integrated into Devices for execution on the
Deployment Platforms, and
(ii) grant sublicenses to Redistributables, as distributed hereunder, for
Customers solely for Customer's internal use and to the extent necessary in
order for the Customers to use the Devices for their respective intended
purposes.
Right to distribute the Redistributables with Devices as provided herein is
conditional upon the Licensee having purchased and paid the appropriate amount
of Development and Distribution Licenses from The Qt Company before
distributing any Redistributables to Customers.
3.4 Further Requirements
The licenses granted above in this Section 3 by The Qt Company to Licensee are
conditional and subject to Licensee's compliance with the following terms:
(i) Licensee shall not remove or alter any copyright, trademark or other
proprietary rights notice contained in any portion of the Licensed Software;
(ii) Applications must add primary and substantial functionality to the
Licensed Software;
(iii) Applications may not pass on functionality which in any way makes it
possible for others to create software with the Licensed Software; provided
however that Licensee may use the Licensed Software's scripting and QML ("Qt
Quick") functionality solely in order to enable scripting, themes and styles
that augment the functionality and appearance of the Application(s) without
adding primary and substantial functionality to the Application(s);
(iv) Applications must not compete with the Licensed Software;
(v) Licensee shall not use The Qt Company's or any of its suppliers' names,
logos, or trademarks to market Applications, except that Licensee may use
"Built with Qt" logo to indicate that Application(s) was developed using the
Licensed Software;
(vi) Licensee shall not distribute, sublicense or disclose source code of
Licensed Software to any third party (provided however that Licensee may
appoint employee(s) of Contractors as Designated Users to use Licensed
Software pursuant to this Agreement). Such right may be available for the
Licensee subject to a separate software development kit ("SDK") license
agreement to be concluded with The Qt Company;
(vii) Licensee shall not grant the Customers a right to (i) make copies of the
Redistributables except when and to the extent required to use the Applications
and/or Devices for their intended purpose, (ii) modify the Redistributables or
create derivative works thereof, (iii) decompile, disassemble or otherwise
reverse engineer Redistributables, or (iv) redistribute any copy or portion of
the Redistributables to any third party, except as part of the onward sale of
the Device on which the Redistributables are installed;
(viii) Licensee shall not and shall cause that its Affiliates or Contractors
shall not a) in any way combine, incorporate or integrate Licensed Software
with, or use Licensed Software for creation of, any software created with or
incorporating Open Source Qt, or b) incorporate or integrate Applications
into a hardware device or product other than a Device, unless Licensee has
received an advance written permission from The Qt Company to do so. Absent
such written permission, any and all distribution by the Licensee during the
Term of a hardware device or product a) which incorporate or integrate any
part of Licensed Software or Open Source Qt; or b) where the main user
interface or substantial functionality is provided by software build with
Licensed Software or Open Source Qt or otherwise depends on the Licensed
Software or Open Source Qt, shall be considered as a Device distribution under
this Agreement and dependent on compliance thereof (including but not limited
to obligation to pay applicable License Fees for such distribution);
(ix) Licensee shall cause all of its Affiliates and Contractors entitled to
make use of the licenses granted under this Agreement, to be contractually
bound to comply with the relevant terms of this Agreement and not to use the
Licensed Software beyond the terms hereof and for any purposes other than
operating within the scope of their services for Licensee. Licensee shall be
responsible for any and all actions and omissions of its Affiliates and
Contractors relating to the Licensed Software and use thereof (including but
not limited to payment of all applicable License Fees);
(x) Except when and to the extent explicitly provided in this Section 3,
Licensee shall not transfer, publish, disclose, display or otherwise make
available the Licensed Software;
; and
(xi) Licensee shall not attempt or enlist a third party to conduct or attempt
to conduct any of the above.
Above terms shall not be applicable if and to the extent they conflict with any
mandatory provisions of any applicable laws.
Any use of Licensed Software beyond the provisions of this Agreement is
strictly prohibited and requires an additional license from The Qt Company.
4. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions. Third
Party Software does not comprise part of the Licensed Software. In some cases,
access to Third Party Software may be included in the Licensed Software. Such
Third Party Software will be listed in the ".../src/3rdparty" source tree
delivered with the Licensed Software or documented in the Licensed Software, as
such may be amended from time to time. Licensee acknowledges that use or
distribution of Third Party Software is in all respects subject to applicable
license terms of applicable third party right holders.
5. PRE-RELEASE CODE
The Licensed Software may contain pre-release code and functionality marked or
otherwise stated as "Technology Preview", "Alpha", "Beta" or similar
designation. Such pre-release code may be present in order to provide
experimental support for new platforms or preliminary versions of one or more
new functionalities. The pre-release code may not be at the level of
performance and compatibility of a final, generally available, product
offering of the Licensed Software. The pre-release parts of the Licensed
Software may not operate correctly, may contain errors and may be substantially
modified by The Qt Company prior to the first commercial product release, if
any. The Qt Company is under no obligation to make pre-release code
commercially available, or provide any Support or Updates relating thereto. The
Qt Company assumes no liability whatsoever regarding any pre-release code, but
any use thereof is exclusively at Licensee's own risk and expense.
6. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Qt Company hereby represents and warrants that it has the power and
authority to grant the rights and licenses granted to Licensee under this
Agreement.
Except as set forth above, the Licensed Software is licensed to Licensee
"as is" and Licensee's exclusive remedy and The Qt Company's entire liability
for errors in the Licensed Software shall be limited, at The Qt Company's
option, to correction of the error, replacement of the Licensed Software or
return of the applicable fees paid for the defective Licensed Software for the
time period during which the License is not able to utilize the Licensed
Software under the terms of this Agreement.
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF
ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-
INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT
WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT
IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE
RISK OF AND RESPONSIBILITY OF LICENSEE.
7. INDEMNIFICATION AND LIMITATION OF LIABILITY
7.1 Limitation of Liability
EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II)
BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO
EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT,
LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL,
CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND,
HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES
SPECIFICALLY AGREE THAT LICENSEE'S OBLIGATION TO PAY LICENSE AND OTHER FEES
CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE
CONSIDERED AS A DIRECT DAMAGE.
EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II)
BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN
NO EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT
EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT COMPANY FROM
LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE
EVENT RESULTING IN SUCH LIABILITY.
THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE RISKS UNDER THIS AGREEMENT
BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE
LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT.
7.2 Licensee's Indemnification
Licensee shall indemnify and hold harmless The Qt Company from and against any
claim, injury, judgment, settlement, loss or expense, including attorneys' fees
related to: (a) Licensee's misrepresentation in connection with The Qt Company
or the Licensed Software or breach of this Agreement, (b) the Application or
Device (except where such cause of liability is solely attributable to the
Licensed Software).
8. SUPPORT, UPDATES AND ONLINE SERVICES
Upon due payment of the agreed License Fees the Licensee will be eligible to
receive Support and Updates and to use the Online Services during the License
Term, provided, however, that in the event the License Term is longer than 36
months, Support is provided only for the first 12 months, unless the Parties
specifically otherwise agree.
Unless otherwise decided by The Company at its free and absolute discretion,
Upgrades will not be included in the Support but may be available subject to
additional fees.
From time to time The Qt Company may change the Support terms, provided that
during the respective ongoing License Term the level of Support provided by The
Qt Company may not be reduced without the consent of the Licensee.
Unless otherwise agreed, The Qt Company shall not be responsible for providing
any service or support to Customers.
9. CONFIDENTIALITY
Each Party acknowledges that during the Term of this Agreement each Party may
receive information about the other Party's business, business methods,
business plans, customers, business relations, technology, and other
information, including the terms of this Agreement, that is confidential and
of great value to the other Party, and the value of which would be
significantly reduced if disclosed to third parties ("Confidential
Information"). Accordingly, when a Party (the "Receiving Party") receives
Confidential Information from the other Party (the "Disclosing Party"), the
Receiving Party shall only disclose such information to employees and
Contractors on a need to know basis, and shall cause its employees and
employees of its Affiliates to: (i) maintain any and all Confidential
Information in confidence; (ii) not disclose the Confidential Information to a
third party without the Disclosing Party's prior written approval; and (iii)
not, directly or indirectly, use the Confidential Information for any purpose
other than for exercising its rights and fulfilling its responsibilities
pursuant to this Agreement. Each Party shall take reasonable measures to
protect the Confidential Information of the other Party, which measures shall
not be less than the measures taken by such Party to protect its own
confidential and proprietary information.
Obligation of confidentiality shall not apply to information that (i) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (ii) was in the Receiving Party's lawful possession prior to
the disclosure hereunder and was not subject to limitations on disclosure or
use; (iii) is developed independently by employees or Contractors of the
Receiving Party or other persons working for the Receiving Party who have not
had access to the Confidential Information of the Disclosing Party, as proven
by the written records of the Receiving Party; (iv) is lawfully disclosed to
the Receiving Party without restrictions, by a third party not under an
obligation of confidentiality; or (v) the Receiving Party is legally compelled
to disclose, in which case the Receiving Party shall notify the Disclosing
Party of such compelled disclosure and assert the privileged and confidential
nature of the information and cooperate fully with the Disclosing Party to
limit the scope of disclosure and the dissemination of disclosed Confidential
Information to the minimum extent necessary.
The obligations under this Section 9 shall continue to remain in force for a
period of five (5) years after the last disclosure, and, with respect to trade
secrets, for so long as such trade secrets are protected under applicable trade
secret laws.
10. FEES, DELIVERY AND PAYMENT
10.1 License Fees
License Fees are described in The Qt Company's standard price list, quote or
Purchase Order confirmation or in an appendix hereto, as the case may be.
The License Fees shall not be refunded or claimed as a credit in any event or
for any reason whatsoever.
10.2 Ordering Licenses
Licensee may purchase Development Licenses and Distribution Licenses pursuant
to agreed pricing terms or, if no specific pricing terms have been agreed upon,
at The Qt Company's standard pricing terms applicable at the time of purchase.
Licensee shall submit all purchase orders for Development Licenses and
Distribution Licenses to The Qt Company by email or any other method acceptable
to The Qt Company (each such order is referred to herein as a "Purchase Order")
for confirmation, whereupon the Purchase Order shall become binding between the
Parties.
10.3 Distribution License Packs
Unless otherwise agreed, Distribution Licenses shall be purchased by way of
Distribution License Packs.
Upon due payment of the ordered Distribution License Pack(s), the Licensee will
have an account of Distribution Licenses available for installing, bundling or
integrating (all jointly "installing") the Redistributables with the Devices or
for otherwise distributing the Redistributables in accordance with this
Agreement.
Each time Licensee "installs" or distributes a copy of Redistributables, then
one Distribution License is used, and Licensee's account of available
Distribution Licenses is decreased accordingly.
Licensee may "install" copies of the Redistributables so long as Licensee has
Distribution Licenses remaining on its account.
Redistributables will be deemed to have been "installed" into a Device when one
of the following circumstances shall have occurred: a) the Redistributables
have been loaded onto the Device and used outside of the Licensee's premises or
b) the Device has been fully tested and placed into Licensee's inventory
(or sold) for the first time (i.e., Licensee will not be required to use
(or pay for) more than one Distribution License for each individual Device,
e.g. in a situation where a Device is returned to Licensee's inventory after
delivery to a distributor or sale to a Customer). In addition, if Licensee
includes a back-up copy of the Redistributables on a CD-ROM or other storage
medium along with the product, that backup copy of the Redistributables will
not be deemed to have been "installed" and will not require an additional
Distribution License.
10.4 Payment Terms
License Fees and any other charges under this Agreement shall be paid by
Licensee no later than thirty (30) days from the date of the applicable invoice
from The Qt Company.
The Qt Company will submit an invoice to Licensee after the date of this
Agreement and/or after The Qt Company receives a Purchase Order from
Licensee.
A late payment charge of the lower of (a) one percent per month; or (b) the
interest rate stipulated by applicable law, shall be charged on any unpaid
balances that remain past due.
The Qt Company shall have the right to suspend, terminate or withhold grants
of all rights to the Licensed Software hereunder, including but not limited to
the Developer License, Distribution License, and Support, should Licensee fail
to make payment in timely fashion.
10.5 Taxes
All License Fees and other charges payable hereunder are gross amounts but
exclusive of any value added tax, use tax, sales tax and other taxes, duties or
tariffs ("Taxes"). Such applicable Taxes shall be paid by Licensee, or, where
applicable, in lieu of payment of such Taxes, Licensee shall provide an
exemption certificate to The Qt Company and any applicable authority.
11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS
11.1 Licensee's Record-keeping
Licensee shall at all times maintain accurate and up-to-date written records of
Licensee's activities related to the use of Licensed Software and distribution
of Redistributables. The records shall be adequate to determine Licensee's
compliance with the provisions of this Agreement and to demonstrate the number
of Designated Users and Redistributables distributed by Licensee. The records
shall conform to good accounting practices reasonably acceptable to The Qt
Company.
Licensee shall, within thirty (30) days from receiving The Qt Company's request
to that effect, deliver to The Qt Company a report on Licensee's usage of
Licensed Software, such report to copies of Redistributables distributed by
Licensee during that calendar quarter, and also detailing the number of
undistributed copies of Redistributables made by Licensee and remaining in its
account contain information, in sufficient detail, on (i) amount of users
working with Licensed Software, (ii) copies of Redistributables distributed by
Licensee during that calendar quarter, (iii) number of undistributed copies of
Redistributables and corresponding number of unused Distribution Licenses
remaining on Licensee's account, and (iv) any other information as The Qt
Company may reasonably require from time to time.
11.2. The Qt Company's Audit Rights
The Qt Company or an independent auditor acting on behalf of The Qt Company's,
may, upon at least five (5) business days' prior written notice and at its
expense, audit Licensee with respect to the use of the Redistributables, but
not more frequently than once during each 6-month period. Such audit may be
conducted by mail, electronic means or through an in-person visit to Licensee's
place of business. Any such in-person audit shall be conducted during regular
business hours at Licensee's facilities and shall not unreasonably interfere
with Licensee's business activities. The Qt Company or the independent auditor
acting on behalf of The Qt Company shall be entitled to inspect Licensee's
Records. All such Licensee's Records and use thereof shall be subject to an
obligation of confidentiality under this Agreement.
If an audit reveals that Licensee is using the Licensed Software beyond scope
of the licenses Licensee has paid for, Licensee agrees to immediately pay The
Qt Company any amounts owed for such unauthorized use.
In addition, in the event the audit reveals a material violation of the terms
of this Agreement (underpayment of more than 5% of License Fees shall always be
deemed a material violation for purposes of this section), then the Licensee
shall pay The Qt Company's reasonable cost of conducting such audit.
12 TERM AND TERMINATION
12.1 Term
This Agreement shall enter into force upon due acceptance by both Parties and
remain in force for as long as there is any Development License(s) in force
("Term"), unless and until terminated pursuant to the terms of this Section 12.
12.2 Termination by The Qt Company
The Qt Company shall have the right to terminate this Agreement upon thirty
(30) days prior written notice if the Licensee is in material breach of any
obligation of this Agreement and fails to remedy such breach within such notice
period.
12.3 Mutual Right to Terminate
Either Party shall have the right to terminate this Agreement immediately upon
written notice in the event that the other Party becomes insolvent, files for
any form of bankruptcy, makes any assignment for the benefit of creditors, has
a receiver, administrative receiver or officer appointed over the whole or a
substantial part of its assets, ceases to conduct business, or an act
equivalent to any of the above occurs under the laws of the jurisdiction of the
other Party.
12.4 Parties' Rights and Duties upon Termination
Upon expiry or termination of the Agreement Licensee shall cease and shall
cause all Designated Users (including those of its Affiliates' and
Contractors') to cease using the Licensed Software and distribution of the
Redistributables under this Agreement.
Notwithstanding the above, in the event the Agreement expires or is terminated:
(i) as a result of The Qt Company choosing not to renew the Development
License(s) as set forth in Section 3.1, then all valid licenses possessed by
the Licensee at such date shall be extended to be valid in perpetuity under the
terms of this Agreement and Licensee is entitled to purchase additional
licenses as set forth in Section 10.2; or
(ii) for reason other than by The Qt Company pursuant to item (i) above or
pursuant to Section 12.2, then the Licensee is entitled, for a period of six
(6) months after the effective date of termination, to continue distribution of
Devices under the Distribution Licenses paid but unused at such effective date
of termination.
Upon any such termination the Licensee shall destroy or return to The Qt
Company all copies of the Licensed Software and all related materials and will
certify the same to The Qt Company upon its request, provided however that
Licensee may retain and exploit such copies of the Licensed Software as it may
reasonably require in providing continued support to Customers.
Expiry or termination of this Agreement for any reason whatsoever shall not
relieve Licensee of its obligation to pay any License Fees accrued or payable
to The Qt Company prior to the effective date of termination, and Licensee
shall immediately pay to The Qt Company all such fees upon the effective date
of termination. Termination of this Agreement shall not affect any rights of
Customers to continue use of Applications and Devices (and therein incorporated
Redistributables).
12.5 Extension in case of bankruptcy
In the event The Qt Company is declared bankrupt under a final, non-cancellable
decision by relevant court of law, and this Agreement is not, at the date of
expiry of the Development License(s) pursuant to Section 3.1, assigned to
party, who has assumed The Qt Company's position as a legitimate licensor of
Licensed Software under this Agreement, then all valid licenses possessed by
the Licensee at such date of expiry, and which the Licensee has not notified
for expiry, shall be extended to be valid in perpetuity under the terms of
this Agreement.
13. GOVERNING LAW AND LEGAL VENUE
In the event this Agreement is in the name of The Qt Company Inc., a Delaware
Corporation, then:
(i) this Agreement shall be construed and interpreted in accordance with the
laws of the State of California, USA, excluding its choice of law provisions;
(ii) the United Nations Convention on Contracts for the International Sale of
Goods will not apply to this Agreement; and
(iii) any dispute, claim or controversy arising out of or relating to this
Agreement or the breach, termination, enforcement, interpretation or validity
thereof, including the determination of the scope or applicability of this
Agreement to arbitrate, shall be determined by arbitration in San Francisco,
USA, before one arbitrator. The arbitration shall be administered by JAMS
pursuant to JAMS' Streamlined Arbitration Rules and Procedures. Judgment on the
Award may be entered in any court having jurisdiction. This Section shall not
preclude parties from seeking provisional remedies in aid of arbitration from a
court of appropriate jurisdiction.
In the event this Agreement is in the name of The Qt Company Ltd., a Finnish
Company, then:
(i) this Agreement shall be construed and interpreted in accordance with the
laws of Finland, excluding its choice of law provisions;
(ii) the United Nations Convention on Contracts for the International Sale of
Goods will not apply to this Agreement; and
(iii) any disputes, controversy or claim arising out of or relating to this
Agreement, or the breach, termination or validity thereof shall be shall be
finally settled by arbitration in accordance with the Arbitration Rules of
Finland Chamber of Commerce. The arbitration tribunal shall consist of one (1),
or if either Party so requires, of three (3), arbitrators. The award shall be
final and binding and enforceable in any court of competent jurisdiction. The
arbitration shall be held in Helsinki, Finland and the process shall be
conducted in the English language. This Section shall not preclude parties from
seeking provisional remedies in aid of arbitration from a court of appropriate
jurisdiction.
14. GENERAL PROVISIONS
14.1 No Assignment
Except in the case of a merger or sale of substantially all of its corporate
assets, Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior written
consent of The Qt Company, which shall not be unreasonably withheld or delayed.
The Qt Company shall be entitled to freely assign or transfer any of its
rights, benefits or obligations under this Agreement.
14.2 No Third Party Representations
Licensee shall make no representations or warranties concerning the Licensed
Software on behalf of The Qt Company. Any representation or warranty Licensee
makes or purports to make on The Qt Company's behalf shall be void as to The
Qt Company.
14.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably should
survive termination of this Agreement shall so be deemed to survive.
14.4 Entire Agreement
This Agreement, the exhibits hereto, the License Certificate and any applicable
Purchase Order constitute the complete agreement between the Parties and
supersedes all prior or contemporaneous discussions, representations, and
proposals, written or oral, with respect to the subject matters discussed
herein.
In the event of any conflict or inconsistency between this Agreement and any
Purchase Order, the terms of this Agreement will prevail over the terms of the
Purchase Order with respect to such conflict or inconsistency.
Parties specifically acknowledge and agree that this Agreement prevails over
any click-to-accept or similar agreements the Designated Users may need to
accept online upon download of the Licensed Software, as may be required by
The Qt Company's applicable processes relating to Licensed Software.
14.5 Modifications
No modification of this Agreement shall be effective unless contained in a
writing executed by an authorized representative of each Party. No term or
condition contained in Licensee's Purchase Order shall apply unless expressly
accepted by The Qt Company in writing.
14.6 Force Majeure
Except for the payment obligations hereunder, neither Party shall be liable to
the other for any delay or non-performance of its obligations hereunder in the
event and to the extent that such delay or non-performance is due to an event
of act of God, terrorist attack or other similar unforeseeable catastrophic
event that prevents either Party for fulfilling its obligations under this
Agreement and which such Party cannot avoid or circumvent ("Force Majeure
Event"). If the Force Majeure Event results in a delay or non-performance of a
Party for a period of three (3) months or longer, then either Party shall have
the right to terminate this Agreement with immediate effect without any
liability (except for the obligations of payment arising prior to the event of
Force Majeure) towards the other Party.
14.7 Notices
Any notice given by one Party to the other shall be deemed properly given and
deemed received if specifically acknowledged by the receiving Party in writing
or when successfully delivered to the recipient by hand, fax, or special
courier during normal business hours on a business day to the addresses
specified for each Party on the signature page. Each communication and document
made or delivered by one Party to the other Party pursuant to this Agreement
shall be in the English language.
14.8 Export Control
Licensee acknowledges that the Redistributables may be subject to export
control restrictions under the applicable laws of respective countries.
Licensee shall fully comply with all applicable export license restrictions
and requirements as well as with all laws and regulations relating to the
Redistributables and exercise of licenses hereunder and shall procure all
necessary governmental authorizations, including without limitation, all
necessary licenses, approvals, permissions or consents, where necessary for the
re-exportation of the Redistributables, Applications and/or Devices.
14.9 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder, shall
remain with The Qt Company and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with any
other software or hardware not delivered by The Qt Company under this Agreement.
14.10 Attorney Fees
The prevailing Party in any action to enforce this Agreement shall be entitled
to recover its attorney's fees and costs in connection with such action.
14.11 Severability
If any provision of this Agreement shall be adjudged by any court of competent
jurisdiction to be unenforceable or invalid, that provision shall be limited or
eliminated to the minimum extent necessary so that this Agreement shall
otherwise remain in full force and effect and enforceable.
IN WITNESS WHEREOF, the Parties hereto, intending to be legally bound hereby,
have caused this Agreement to be executed by Licensee's authorized
representative installing the Licensed Software and accepting the terms
hereof in connection therewith.
Appendix 1
1. Parts of the Licensed Software that are permitted for distribution in
object code form only ("Redistributables") under this Agreement:
- The Licensed Software's Qt Essentials and Qt Add-on libraries
- The Licensed Software's configuration tool ("qtconfig")
- The Licensed Software's help tool ("Qt Assistant")
- The Licensed Software's internationalization tools ("Qt Linguist", "lupdate",
"lrelease")
- The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" or
"qmlviewer")
- The Licensed Software's installer framework
2. Parts of the Licensed Software that are not permitted for distribution
include, but are not limited to:
- The Licensed Software's source code and header files
- The Licensed Software's documentation
- The Licensed Software's documentation generation tool ("qdoc")
- The Licensed Software's tool for writing makefiles ("qmake")
- The Licensed Software's Meta Object Compiler ("moc")
- The Licensed Software's User Interface Compiler ("uic")
- The Licensed Software's Resource Compiler ("rcc")
- The Licensed Software's parts of the IDE tool ("Qt Creator")
- The Licensed Software's parts of the Design tools ("Qt 3D Studio" or
"Qt Quick Designer")
- The Licensed Software's Emulator

2
README
View File

@@ -21,12 +21,10 @@ HOW TO BUILD QT5
Opensource users:
<source_package> = qt-everywhere-opensource-src-<version>
<license> = -opensource
Commercial users:
<source_package> = qt-everywhere-enterprise-src-<version>
<license> = -commercial
Linux, Mac:

80
_clang-format Normal file
View File

@@ -0,0 +1,80 @@
# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
# This is the clang-format configuration style to be used by Qt,
# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
# https://wiki.qt.io/Coding_Conventions
---
# Webkit style was loosely based on the Qt style
BasedOnStyle: WebKit
Standard: Cpp11
# Leave the line breaks up to the user.
# Note that this may be changed at some point in the future.
ColumnLimit: 0
# How much weight do extra characters after the line length limit have.
# PenaltyExcessCharacter: 4
# Disable reflow of qdoc comments: indentation rules are different.
# Translation comments are also excluded.
CommentPragmas: "^!|^:"
# We want a space between the type and the star for pointer types.
PointerBindsToType: false
# We use template< without space.
SpaceAfterTemplateKeyword: false
# We want to break before the operators, but not before a '='.
BreakBeforeBinaryOperators: NonAssignment
# Braces are usually attached, but not after functions or class declarations.
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
# When constructor initializers do not fit on one line, put them each on a new line.
ConstructorInitializerAllOnOneLineOrOnePerLine: true
# Indent initializers by 4 spaces
ConstructorInitializerIndentWidth: 4
# Indent width for line continuations.
ContinuationIndentWidth: 8
# No indentation for namespaces.
NamespaceIndentation: None
# Horizontally align arguments after an open bracket.
# The coding style does not specify the following, but this is what gives
# results closest to the existing code.
AlignAfterOpenBracket: true
AlwaysBreakTemplateDeclarations: true
# Ideally we should also allow less short function in a single line, but
# clang-format does not handle that.
AllowShortFunctionsOnASingleLine: Inline
# The coding style specifies some include order categories, but also tells to
# separate categories with an empty line. It does not specify the order within
# the categories. Since the SortInclude feature of clang-format does not
# re-order includes separated by empty lines, the feature is not used.
SortIncludes: false
# macros for which the opening brace stays attached.
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]

View File

@@ -1,27 +1,27 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2015 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 NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-16.04-x86_64-2 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-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.11-x86_64-3 Clang Release NoFramework DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-2 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
Template Target OS Target arch Compiler Target Compiler Features
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
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-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-8 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,22 @@
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-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-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

@@ -1,22 +1,22 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw53 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 Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 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 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
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-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-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

@@ -1,4 +1,7 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild DisableTests
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild DisableTests
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

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

View File

@@ -1,4 +1,4 @@
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 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests

View File

@@ -37,8 +37,11 @@
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/android"
@@ -46,15 +49,15 @@ sdkTargetFolder="$targetFolder/sdk"
basePath="http://ci-files01-hki.intra.qt.io/input/android"
toolsVersion="r25.2.5"
toolsFile="tools_$toolsVersion-linux.zip"
ndkVersion="r10e"
toolsVersion="r26.1.1"
toolsFile="sdk-tools-linux-4333796.zip"
ndkVersion="r18b"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="25.0.2"
sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-21"
toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"
ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
@@ -71,33 +74,43 @@ rm "$ndkTargetFile"
rm "$toolsTargetFile"
echo "Changing ownership of Android files."
if uname -a |grep -q "el6\|el7"; then
if uname -a |grep -q "el7"; then
sudo chown -R qt:wheel "$targetFolder"
else
sudo chown -R qt:users "$targetFolder"
fi
echo "Running SDK manager for platforms;$sdkApiLevel, tools, 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" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
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" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
else
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
fi
echo "Checking the contents of Android SDK..."
ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
# shellcheck disable=SC2129
echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
echo "Android NDK = $ndkVersion" >> ~/versions.txt
cd $sdkTargetFolder/tools/bin
cd "$sdkTargetFolder/tools/bin"
./sdkmanager --install "emulator"
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
echo "Checking the contents of Android SDK again..."
ls -l "$sdkTargetFolder"
echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f
# Purely informative, show the list of avd devices
./avdmanager list avd

View File

@@ -35,9 +35,10 @@
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
function waitLoop {
while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
echo "Waiting for other software managers to finish..."
sleep 0.5
done
}

View File

@@ -5,7 +5,7 @@
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -37,7 +37,9 @@
# CMake is needed for autotests that verify that Qt can be built with CMake
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.6.2"
@@ -50,3 +52,6 @@ appPrefix="cmake-$version-Linux-x86_64"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
SetEnvVar "PATH" "$targetFolder/bin:\$PATH"
echo "CMake = $version" >> ~/versions.txt

View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
sudo chmod -x /etc/cron.daily/cracklib-runtime

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo chmod -x /etc/cron.daily/mlocate*

View File

@@ -40,5 +40,5 @@ echo "Disable Network Time Protocol (NTP)"
if uname -a |grep -q "Ubuntu"; then
sudo timedatectl set-ntp false
else
systemctl &>/dev/null && sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
(systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off
fi

View File

@@ -0,0 +1,52 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
set -ex
# Download and install the docker engine.
sudo apt-get install curl -y
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
sudo apt-get update
sudo apt-get install docker-ce -y
sudo usermod -a -G docker $USER
sudo docker info
# 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
# Start testserver provisioning
source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh"

View File

@@ -0,0 +1,78 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# shellcheck source=../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"
version="1.38.1"
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="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
targetFolder="/opt/emsdk"
sudo mkdir "$targetFolder"
InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
sudo chmod -R a+rwx "$targetFolder"
echo "Writing $targetFolder/.emscripten"
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'
EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
SPIDERMONKEY_ENGINE = ''
V8_ENGINE = ''
TEMP_DIR = '/tmp'
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 "EMSCRIPTEN" "$targetFolder/emscripten-$version"
SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"

View File

@@ -34,7 +34,10 @@
#############################################################################
# This script installs FBX SDK
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -e

View File

@@ -0,0 +1,102 @@
#!/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 builds GCC from sources
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex
function InstallGCC() {
version=$1
priority=$2
prebuiltSHA1=$3
sourcesSHA1=$4
tmpFolder="/tmp"
prebuiltGCC="http://ci-files01-hki.intra.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz"
prebuiltTarget="$tmpFolder/gcc-$version-prebuilt.tar.gz"
installPrefix="/usr/local"
suffixVersion=$(echo "$version" | cut -d "." -f1,2)
sourceFile="gcc-$version.tar.xz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"
targetFile="$tmpFolder/$sourceFile"
buildFolder="$HOME/gcc_build"
echo "Fetching prebuilt GCC."
curl --fail -L --retry 5 --retry-delay 5 -o "$prebuiltTarget" "$prebuiltGCC" || (
echo "Fetching prebuilt GCC failed. Building from sources."
DownloadURL "$cachedUrl" "$officialUrl" "$sourcesSHA1" "$targetFile"
)
if [ -f "$prebuiltTarget" ]; then
echo "$prebuiltSHA1 *$prebuiltTarget" | sha1sum -c -
sudo tar -xzf "$prebuiltTarget" -C "$installPrefix"
rm -rf "$prebuiltTarget"
else
tar -C "$tmpFolder" -xJf "$targetFile"
mkdir -p "$buildFolder"
cd "$tmpFolder/gcc-$version"
sudo "$tmpFolder/gcc-$version/contrib/download_prerequisites"
cd "$buildFolder"
"$tmpFolder/gcc-$version/configure" --disable-bootstrap --enable-languages=c,c++,lto --prefix="$installPrefix" --program-suffix="-$suffixVersion"
make -j4
sudo make install
rm -rf "$targetFile"
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
if [ -f "/usr/sbin/update-alternatives" ]; then
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
else
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
fi
echo "GCC = $version" >> ~/versions.txt
}

View File

@@ -35,7 +35,9 @@
# This script installs INTEGRITY
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="11.4.4"

View File

@@ -5,7 +5,7 @@
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -35,6 +35,8 @@
set +e
# shellcheck disable=SC1090
# We need to source to be able to use cmake in the shell
if uname -a |grep -q "Ubuntu"; then
source ~/.profile
@@ -44,26 +46,28 @@ fi
set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
# shellcheck disable=SC2064
trap "sudo rm -fr $TEMPDIR" EXIT
cd $TEMPDIR
cd "$TEMPDIR"
sudo pip install --upgrade pip
sudo pip install six
git clone https://github.com/open62541/open62541.git open62541
cd open62541
git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629
git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f
mkdir build
cd build
cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 ..
TARGETPATH=/opt/open62541
cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
make
sudo make install
sudo /sbin/ldconfig
SetEnvVar "QTOPCUA_OPEN62541_LIB_PATH" "/usr/local/lib/open62541"
SetEnvVar "QTOPCUA_OPEN62541_INCLUDE_PATH" "/usr/local/include/open62541"
SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"

View File

@@ -36,15 +36,17 @@
# This script install OpenSSL from sources.
# Requires GCC and Perl to be in PATH.
# 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.2g"
version="1.0.2p"
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="36af23887402a5ea4ebef91df8e61654906f58f2"
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
@@ -54,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
tar -xzf "$targetFile" -C "$installFolder"
# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
mv "${opensslHome}g" "${opensslHome}"
mv "${opensslHome}p" "${opensslHome}"
pushd "$opensslHome"
echo "Running configure"

View File

@@ -0,0 +1,66 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script installs QNX 6.6.0.
set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz"
sha1="ffcf91489699c42ce9c1d74941f1829531752bbe"
folderName="qnx660"
targetFile="qnx660.tar.gz"
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
echo "$sha1 $targetFile" | sha1sum --check
if [ ! -d "$targetFolder" ]; then
mkdir -p $targetFolder
fi
sudo tar -C $targetFolder -xvzf $targetFile
sudo chown -R qt:users "$targetFolder"/"$folderName"
# Verify that we have last file in tar
if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then
echo "Installation failed!"
exit -1
fi
rm -rf $targetFile
# Set env variables
SetEnvVar "QNX_660" "$targetFolder$folderName"
echo "QNX SDP = 6.6.0" >> ~/versions.txt

View File

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

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo apt-get remove update-manager

View File

@@ -0,0 +1,6 @@
FROM ubuntu:16.04
RUN apt-get update && apt-get install -y apache2 libcgi-session-perl wget avahi-daemon
EXPOSE 80 443
# install configurations and test data
RUN wget https://tools.ietf.org/rfc/rfc3252.txt

View File

@@ -0,0 +1,9 @@
FROM ubuntu:16.04
RUN apt-get update && apt-get install -y gdebi-core=0.9.5.7ubuntu1 wget avahi-daemon
RUN wget http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb
RUN gdebi -n dante-server_1.4.1-1_amd64.deb
EXPOSE 1080-1081
# install configurations and test data
COPY danted /etc/init.d/
COPY danted-authenticating /etc/init.d/

View File

@@ -0,0 +1,93 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: danted
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
### END INIT INFO
#
# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/danted
NAME=danted
DESC="Dante SOCKS daemon"
PIDFILE=/var/run/$NAME.pid
CONFFILE=/etc/$NAME.conf
test -f $DAEMON || exit 0
set -e
# This function makes sure that the Dante server can write to the pid-file.
touch_pidfile ()
{
if [ -r $CONFFILE ]; then
uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' \
$CONFFILE`"
if [ -n "$uid" ]; then
touch $PIDFILE
chown $uid $PIDFILE
fi
fi
}
. /lib/lsb/init-functions
case "$1" in
start)
if ! egrep -cve '^ *(#|$)' \
-e '^(logoutput|user\.((not)?privileged|libwrap)):' $CONFFILE > /dev/null
then
echo "Not starting $DESC: not configured."
exit 0
fi
echo -n "Starting $DESC: "
touch_pidfile
start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON -- -D
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
echo "$NAME."
;;
reload|force-reload)
#
# If the daemon can reload its config files on the fly
# for example by sending it SIGHUP, do it here.
#
# If the daemon responds to changes in its config file
# directly anyway, make this a do-nothing entry.
#
echo "Reloading $DESC configuration files."
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --exec $DAEMON -- -D
;;
restart)
#
# If the "reload" option is implemented, move the "force-reload"
# option to the "reload" entry above. If not, "force-reload" is
# just the same as "restart".
#
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
sleep 1
touch_pidfile
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -D
echo "$NAME."
;;
status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;;
*)
N=/etc/init.d/$NAME
# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
exit 0

View File

@@ -0,0 +1,97 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: danted-authenticating
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
### END INIT INFO
#
# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/danted
NAME=danted-authenticating
DESC="Dante SOCKS daemon"
PIDFILE=/var/run/$NAME.pid
CONFFILE=/etc/$NAME.conf
DANTED_ARGS="-D -f $CONFFILE"
test -f $DAEMON || exit 0
set -e
# This function makes sure that the Dante server can write to the pid-file.
touch_pidfile ()
{
if [ -r $CONFFILE ]; then
uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' \
$CONFFILE`"
if [ -n "$uid" ]; then
touch $PIDFILE
chown $uid $PIDFILE
fi
fi
}
. /lib/lsb/init-functions
case "$1" in
start)
if ! egrep -cve '^ *(#|$)' \
-e '^(logoutput|user\.((not)?privileged|libwrap)):' $CONFFILE > /dev/null
then
echo "Not starting $DESC: not configured."
exit 0
fi
echo -n "Starting $DESC: "
touch_pidfile
start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
--exec $DAEMON -- $DANTED_ARGS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
echo "$NAME."
;;
reload|force-reload)
#
# If the daemon can reload its config files on the fly
# for example by sending it SIGHUP, do it here.
#
# If the daemon responds to changes in its config file
# directly anyway, make this a do-nothing entry.
#
echo "Reloading $DESC configuration files."
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
--exec $DAEMON -- $DANTED_ARGS
;;
restart)
#
# If the "reload" option is implemented, move the "force-reload"
# option to the "reload" entry above. If not, "force-reload" is
# just the same as "restart".
#
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
sleep 1
touch_pidfile
start-stop-daemon --start --quiet --pidfile $PIDFILE \
--exec $DAEMON -- $DANTED_ARGS
echo "$NAME."
;;
status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;;
*)
N=/etc/init.d/$NAME
# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
exit 0

View File

@@ -0,0 +1,58 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
set -ex
# 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'
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
done
sudo docker images

View File

@@ -0,0 +1,3 @@
FROM ubuntu:16.04
RUN apt-get update && apt-get install -y ftp-proxy=1.9.2.4-10 avahi-daemon
EXPOSE 2121

View File

@@ -0,0 +1,3 @@
FROM ubuntu:16.04
RUN apt-get update && apt-get install -y squid=3.5.12-1ubuntu7.5 avahi-daemon
EXPOSE 3128-3130

View File

@@ -0,0 +1,6 @@
FROM ubuntu:16.04
RUN apt-get update && apt-get install -y vsftpd=3.0.3-3ubuntu2 ftp=0.17-33 wget avahi-daemon
EXPOSE 20-21
# install configurations and test data
RUN wget https://tools.ietf.org/rfc/rfc3252.txt

View File

@@ -0,0 +1,46 @@
#!/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 needs to be called last during provisioning so that the software information will show up last in provision log.
set -ex
# shellcheck disable=SC2129
echo "*********************************************" >> ~/versions.txt
echo "***** All installed packages *****" >> ~/versions.txt
apt list --installed >> ~/versions.txt
echo "*********************************************" >> ~/versions.txt
"$(dirname "$0")/version.sh"

View File

@@ -5,7 +5,7 @@
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage

View File

@@ -39,7 +39,7 @@
set -ex
# shellcheck source=DownloadURL.sh
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
function InstallAppFromCompressedFileFromURL {

View File

@@ -50,8 +50,8 @@ function InstallPKGFromURL {
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
)
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
/usr/bin/shasum --check $targetFile.sha1
echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
/usr/bin/shasum --check "$targetFile.sha1"
echo "Run installer on PKG"
sudo installer -package "$targetFile" -target "$targetDirectory"
echo "Removing file '$targetFile'"

View File

@@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz"
SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e"
appPrefix="cmake-3.6.2-Darwin-x86_64"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz"
SHA1="3d13de8020ce560159fa5cecb669498c48552d96"
appPrefix="cmake-3.11.3-Darwin-x86_64"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"
echo "CMake = 3.6.2" >> ~/versions.txt
echo "CMake = 3.11.3" >> ~/versions.txt

View File

@@ -33,10 +33,6 @@
##
#############################################################################
set -ex
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
if [ "$http_proxy" != "" ]; then
echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
fi
# Disable spotlight and and stop indexing
sudo mdutil -a -i off
sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#############################################################################
##
## 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.
@@ -39,35 +39,21 @@ set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
targetFolder="/opt/fbx"
version="2016.1.2"
fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz"
cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName"
sha1="f82535423c700c605320c52e13e781c92208ec6b"
# officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
targetFolder="/tmp"
targetFile="$targetFolder/$fileName"
installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
ExceptionExtractPrimaryUrl=100
echo "Extracting '$cachedUrl'"
tar -xzf "$cachedUrl" -C "$targetFolder" || (
echo "Failed to uncompress from '$cachedUrl'"
echo "Downloading from '$officialUrl'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl"
echo "Checking SHA1 on PKG '$targetFile'"
echo "$sha1 *$targetFile" > $targetFile.sha1
shasum --check $targetFile.sha1
echo "Extracting '$targetFile'"
tar -xzf "$targetFile" -C "$targetFolder"
)
tar -xzf "$cachedUrl" -C "$targetFolder"
rm -rf "$targetFile"
echo "Running installer for '$installer'"
sudo installer -pkg "$installer" -target "/"
rm -rf "$targetFolder/$fileName"
echo "Copying preinstalled FBX SDK to Applications"
sudo cp -r "$targetFolder/Autodesk" /Applications
# Set env variables
SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/"
SetEnvVar "FBXSDK" "/Applications/Autodesk/FBXSDK/2016.1.2/"
echo "FBX SDK = 2016.1.2" >> ~/versions.txt

View File

@@ -5,7 +5,7 @@
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -32,6 +32,7 @@
## $QT_END_LICENSE$
##
#############################################################################
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex
@@ -44,19 +45,19 @@ function InstallCommandLineTools {
packageName=$4
version=$5
DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
echo "Mounting $packageName"
hdiutil attach /tmp/$packageName
hdiutil attach "/tmp/$packageName"
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
sudo installer -verbose -pkg *.pkg -target /
sudo installer -verbose -pkg ./*.pkg -target /
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3
echo "Unmounting"
umount /Volumes/Command\ Line\ Developer\ Tools/
echo "Removing $packageName"
rm /tmp/$packageName
rm "/tmp/$packageName"
echo "Command Line Tools = $version" >> ~/versions.txt
}

View File

@@ -49,11 +49,27 @@ function InstallXCode() {
version=$2
echo "Uncompressing and installing '$sourceFile'"
xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
if [[ $sourceFile =~ tar ]]; then
cd /Applications/ && sudo tar -zxf "$sourceFile"
else
xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
fi
echo "Versioning application bundle"
majorVersion=$(echo $version | cut -d '.' -f 1)
versionedAppBundle="/Applications/Xcode${majorVersion}.app"
sudo mv /Applications/Xcode.app ${versionedAppBundle}
echo "Selecting Xcode"
sudo xcode-select --switch ${versionedAppBundle}
echo "Accept license"
sudo xcodebuild -license accept
echo "Install packages"
# -runFirstLaunch is valid in 9.x
sudo xcodebuild -runFirstLaunch || true
echo "Enabling developer mode, so that using lldb does not require interactive password entry"
sudo /usr/sbin/DevToolsSecurity -enable

View File

@@ -1,5 +1,11 @@
#!/usr/bin/env bash
# Will install pip utility for python
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo python get-pip.py
rm get-pip.py
function InstallPip {
python=$1
# Will install pip utility for python
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo "$python" get-pip.py
rm get-pip.py
}

View File

@@ -35,8 +35,12 @@
# This script installs python2
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
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"
@@ -45,8 +49,11 @@ DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
InstallPip python2.7
/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv
SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
echo "python2 = 2.7.14" >> ~/versions.txt

View File

@@ -36,8 +36,12 @@
# This script installs python3
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
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-3.6.1-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
@@ -46,9 +50,16 @@ DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv
InstallPip python3.6
/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel
SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
# Install all needed packages in a special wheel cache directory
/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
echo "python3 = 3.6.1" >> ~/versions.txt

View File

@@ -45,5 +45,6 @@
# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
# shellcheck disable=SC2012
SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum

View File

@@ -1,2 +1,2 @@
proxy="http://proxy.intra.qt.io:3128"
proxy=http://proxy.intra.qt.io:3128

View File

@@ -0,0 +1,19 @@
# This file holds all python3 packages need for a certain qt module
# When adding new packages here, first add a comment with the name of the module
# Then all the packages. Duplicates are wanted as every module should install
# all packages it needs and shouldn't depend on a package from another module
#
# qtivi
antlr4-python3-runtime==4.7.1
argh==0.26.2
click==6.7
coloredlogs==10.0
humanfriendly==4.15.1
Jinja2==2.10
MarkupSafe==1.0
path.py==11.0.1
pathtools==0.1.2
PyYAML==3.13
six==1.11.0
typing==3.6.4
watchdog==0.8.3

View File

@@ -1 +0,0 @@
libclang_version="4.0"

View File

@@ -5,7 +5,7 @@
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -54,7 +54,8 @@ function DownloadURL {
)
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
sha1sum --check $targetFile.sha1
echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
sha1sum --check "$targetFile.sha1"
rm -f "$targetFile.sha1"
}

View File

@@ -2,10 +2,10 @@
#############################################################################
##
## 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 test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -64,6 +64,9 @@ function InstallFromCompressedFileFromURL {
"zip")
unzip "$targetFile" -d "$targetDirectory"
;;
"xz")
tar -xf "$targetFile" --directory "$targetDirectory"
;;
*)
exit 1
;;

View File

@@ -5,7 +5,7 @@
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage

View File

@@ -4,7 +4,7 @@
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -34,6 +34,7 @@
set -ex
# shellcheck source=../shared/http_proxy.txt
source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
(wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy) || echo "Proxy not detected at $proxy"

View File

@@ -40,31 +40,39 @@
# In case of Linux, we expect to get the values as args
set -e
# shellcheck source=./check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
BASEDIR=$(dirname "$0")
. $BASEDIR/../shared/sw_versions.txt
url=$1
sha1=$2
version=$3
if [ $# -eq 0 ]
then
# The default values are for macOS package
echo "Using macOS defaults"
libclang_version=6.0
if uname -a |grep -q Darwin; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
sha1="0af8ab8c1174faf4b721d079587190fc32ea8364"
else
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
sha1="ef59b699f4fcce2e45108b3ff04cc7471c1c4abe"
fi
zip="libclang.7z"
zip="/tmp/libclang.7z"
destination="/usr/local/libclang-$version"
curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
echo "$sha1 $zip" | sha1sum --check
DownloadURL $url_cached $url $sha1 $zip
7z x $zip -o/tmp/
rm -rf $zip
sudo mv /tmp/libclang $destination
sudo mv /tmp/libclang "$destination"
echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
echo "libClang = $version" >> ~/versions.txt
# This is a hacked static build of libclang which requires special
# handling on the qdoc side.
SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"

View File

@@ -5,7 +5,7 @@
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -39,10 +39,10 @@
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
SHA1="532fe145096cdd8d679f425cbfd883289150c968"
SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
targetFolder="/opt/paho_broker"
appPrefix="paho.mqtt.testing-$CommitSHA"

View File

@@ -38,9 +38,9 @@ set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
version="6.3.0"
version="6.3.2"
# Branch version without dot
qtBranch="59x"
qtBranch="510x"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
squishFile="squish-$version-qt$qtBranch-linux64.run"
@@ -51,6 +51,9 @@ fi
squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
squishLicenseFile=".squish-3-license.tar.gz"
testSuite="suite_test_squish"
testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
# These checks can be removed when Vanilla OS for all linux and Mac are in
if [ -d "$squishFolder" ]; then
echo "Move old squish to /tmp"
@@ -73,7 +76,7 @@ function MountAndInstall {
usersGroup="staff"
mountFolder="/Volumes"
squishLicenseDir="/Users/qt"
elif uname -a |grep -q "el6\|el7"; then
elif uname -a |grep -q "el7"; then
usersGroup="qt"
mountFolder="/tmp"
squishLicenseDir="/root"
@@ -87,10 +90,15 @@ function MountAndInstall {
squishLicenseDir="/root"
fi
function UnMount {
echo "Unmounting $mountFolder"
sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
}
targetFileMount="$mountFolder"/"$targetFile"
echo "Mounting $url to $mountFolder"
sudo mount "$url" $mountFolder
sudo mount "$url" "$mountFolder"
echo "Create $targetDirectory if needed"
if [ ! -d "/opt" ]; then
sudo mkdir "/opt"
@@ -108,19 +116,20 @@ function MountAndInstall {
target="$targetDirectory"
fi
sudo tar -xzf "$targetFileMount" --directory "$target"
echo "Unmounting $mountFolder"
sudo umount $mountFolder
UnMount
elif [[ $targetFile == *.dmg ]]; then
echo "'dmg-file', no need to uncompress"
sudo cp $targetFileMount /tmp
sudo umount $mountFolder
UnMount
sudo hdiutil attach "/tmp/$targetFile"
sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory"
sudo hdiutil unmount /Volumes/froglogic\ Squish/
mountFolder="/Volumes/froglogic Squish"
UnMount
elif [[ $targetFile == *.run ]]; then
echo "'run-file', no need to uncompress"
sudo cp $targetFileMount $targetDirectory
sudo umount $mountFolder
UnMount
sudo chmod +x $targetDirectory/$targetFile
sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
sudo rm -fr "$targetDirectory/$targetFile"
if uname -a |grep -q "Ubuntu"; then
@@ -140,10 +149,10 @@ echo "Set commands for environment variables in .bashrc"
if uname -a |grep -q "Ubuntu"; then
echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.profile
echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
else
echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.bashrc
echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
fi
echo "Installing squish license to home directory.."
@@ -151,3 +160,14 @@ MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
echo "Installing squish $version.."
MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"
echo "Installing provisioning scripts for squish"
MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz"
echo "Verifying Squish Installation"
if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then
echo "Squish installation tested successfully"
else
echo "Squish test failed! Package wasn't installed correctly."
exit 1
fi

View File

@@ -56,3 +56,5 @@ function Run-Conan-Install
Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
}
}
Write-Output "Conan = 0.24.0" >> ~\versions.txt

View File

@@ -1,11 +1,12 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
$zip = Get-DownloadLocation "Qt3DStudio-3rdparty-win64-CI.zip"
$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
Download $url $url $zip
Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
Extract-7Zip $zip C:\Utils\Qt3DStudio3rdparty
Remove-Item -Path $zip
Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"

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.
@@ -39,9 +39,9 @@
# Msys need to be installed to target machine
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.0.2j"
$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
$version = "1.0.2p"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
$destination = "C:\Utils\openssl-android-master"
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
@@ -53,9 +53,9 @@ Rename-Item C:\Utils\openssl-$version $destination
Remove-Item -Path $zip
Remove-Item C:\Utils\openssl-$version.tar
Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
# Make sure configure for openssl has a "make" and "perl" available
$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
@@ -67,3 +67,5 @@ Pop-Location
# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
Write-Output "Android OpenSSL = $version" >> ~/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.
@@ -40,23 +40,24 @@
# That's why we need to use Andoid-21 API version in Qt 5.9.
# NDK
$ndkVersion = "r10e"
$ndkVersion = "r18b"
$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
$ndkFolder = "c:\utils\android-ndk-$ndkVersion"
$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
# SDK
$sdkVersion = "r24.4.1"
$toolsVersion = "26.1.1"
$toolsFile = "sdk-tools-windows-4333796.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-21"
$sdkBuildToolsVersion = "23.0.3"
$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip"
$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
$sdkFolder = "c:\utils\android-sdk-windows"
$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip"
$sdkBuildToolsVersion = "28.0.3"
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "aa298b5346ee0d63940d13609fe6bec621384510"
$toolsFolder = "c:\Utils\Android\tools"
$sdkZip = "c:\Windows\Temp\$toolsFile"
function Install($1, $2, $3, $4) {
$cacheUrl = $1
@@ -66,35 +67,42 @@ function Install($1, $2, $3, $4) {
Download $offcialUrl $cacheUrl $zip
Verify-Checksum $zip "$checksum"
Extract-Zip $zip C:\Utils
Extract-7Zip $zip C:\Utils\Android
}
function SdkUpdate ($1, $2) {
Write-Host "Running Android SDK update for $1..."
cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2"
}
Write-Host "Installing Android ndk $nkdVersion"
Write-Host "Installing Android NDK $nkdVersion"
Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder
#Write-Host "Installing Android sdk $sdkVersion"
Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl
Set-EnvironmentVariable "ANDROID_SDK_HOME" $sdkFolder
Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
Set-EnvironmentVariable "ANDROID_SDK_HOME" C:\Utils\Android
Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel
# SDK update
SdkUpdate $sdkFolder $sdkApiLevel
SdkUpdate $sdkFolder tools
SdkUpdate $sdkFolder platform-tools
SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion
# kill adb. This process prevents provisioning to continue
$p = Get-Process -Name "adb" -ErrorAction:SilentlyContinue
if ($p -ne $null) {
Write-Host "Stopping adb.exe"
Stop-Process -Force $p
} else {
Write-Host "adb.exe not running"
if (IsProxyEnabled) {
$proxy = Get-Proxy
Write-Host "Using proxy ($proxy) with sdkmanager"
# Remove "http://" from the beginning
$proxy = $proxy.Remove(0,7)
$proxyhost,$proxyport = $proxy.split(':')
$sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" "
}
New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses
$licenseString = "`nd56f5187479451eabf01fb78af6dfcb131a6481e"
Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 -InputObject $licenseString
# Get a PATH where Java's path is defined from previous provisioning
[Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
$sdkmanager_args += " platforms;$sdkApiLevel tools platform-tools build-tools;$sdkBuildToolsVersion"
Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args"
cd $toolsFolder\bin\
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
iex $command
cmd /c "dir C:\Utils\android"
Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt
Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
Write-Output "Android NDK = $ndkVersion" >> ~/versions.txt

View File

@@ -36,7 +36,7 @@
$majorminorversion = "3.6"
$version = "3.6.2"
$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip"
$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
@@ -46,7 +46,7 @@ Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue
Download $officialurl $cachedurl $zip
Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
Extract-Zip $zip C:
Extract-7Zip $zip C:
$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
Rename-Item $defaultinstallfolder C:\CMake

View File

@@ -0,0 +1,13 @@
# Disabling cmd.exe and powershell QuickEdit && InsertMode
#
# These two can freeze console window on win10 sometimes
# manual recovery is pressing enter on console window
. "$PSScriptRoot\helpers.ps1"
Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console`" /V QuickEdit /T REG_dWORD /D 0 /F"
Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console`" /V InsertMode /T REG_dWORD /D 0 /F"
Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_System32_WindowsPowerShell_v1.0_powershell.exe`" /V QuickEdit /T REG_dWORD /D 0 /F"
Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_System32_WindowsPowerShell_v1.0_powershell.exe`" /V InsertMode /T REG_dWORD /D 0 /F"
Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_SysWOW64_WindowsPowerShell_v1.0_powershell.exe`" /V QuickEdit /T REG_dWORD /D 0 /F"
Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_SysWOW64_WindowsPowerShell_v1.0_powershell.exe`" /V InsertMode /T REG_dWORD /D 0 /F"

View File

@@ -37,11 +37,11 @@
$version = "2016.1.2"
$name = "fbx20161_2_fbxsdk_vs2015_win"
$name = "fbx20161_2_fbxsdk_vs2015_win_nospace"
$packageName = "$name.7z"
$installerName = "$name.exe"
$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName"
$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
$sha1 = "de80edc255ffd5ce86ba25869dad72b4c809fd41"
# The executable is an interactive installer only. We can't run it in a script silently.
# $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName"
@@ -49,7 +49,7 @@ $sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e"
#$targetFile = "C:\Windows\Temp\$packageName"
$targetFolder = "C:\Program Files\"
$targetFolder = "C:\Utils\"
#Write-Host "Downloading '$installerName'"
#Download $officialUrl $cacheUrl $targetFile
@@ -60,7 +60,7 @@ Extract-7Zip $cacheUrl $targetFolder
#Remove-Item -Recurse -Force "$packageName"
Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2"
Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX_SDK\2016.1.2"
Write-Output "FBX SDK = $version" >> ~\versions.txt

View File

@@ -38,7 +38,8 @@ function Extract-7Zip
{
Param (
[string]$Source,
[string]$Destination
[string]$Destination,
[string]$Filter
)
Write-Host "Extracting '$Source' to '$Destination'..."
@@ -54,47 +55,10 @@ function Extract-7Zip
$zipExe = "7z.exe"
}
Run-Executable "$zipExe" "x -y `"-o$Destination`" `"$Source`""
}
function Extract-Zip
{
Param (
[string]$Source,
[string]$Destination
)
Write-Host "Extracting '$Source' to '$Destination'..."
New-Item -ItemType Directory -Force -Path $Destination
$shell = new-object -com shell.application
$zipfile = $shell.Namespace($Source)
$destinationFolder = $shell.Namespace($Destination)
$destinationFolder.CopyHere($zipfile.Items(), 16)
}
function Extract-Dev-Folders-From-Zip
{
Param (
[string]$package,
[string]$zipDir,
[string]$installPath
)
$shell = new-object -com shell.application
Write-Host "Extracting contents of $package"
foreach ($subDir in "lib", "include", "bin", "share") {
$zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
if ($zip) {
Write-Host "Extracting $subDir from zip archive"
} else {
Write-Host "$subDir is missing from zip archive - skipping"
continue
}
$destDir = $installPath + "\" + $subdir
New-Item $destDir -type directory
$destinationFolder = $shell.Namespace($destDir)
$destinationFolder.CopyHere($zip.Items(), 16)
if ([string]::IsNullOrEmpty($Filter)) {
Run-Executable "$zipExe" "x -y `"-o$Destination`" `"$Source`""
} else {
Run-Executable "$zipExe" "x -y -aoa `"-o$Destination`" `"$Source`" $Filter"
}
}
@@ -104,6 +68,17 @@ function BadParam
throw("You must specify $Description")
}
function Get-DefaultDownloadLocation
{
return $env:USERPROFILE + "\downloads\"
}
function Get-DownloadLocation
{
Param ([string]$TargetName = $(BadParam("a target filename")))
return (Get-DefaultDownloadLocation) + $TargetName
}
function Download
{
Param (
@@ -112,6 +87,7 @@ function Download
[string] $Destination = $(BadParam("a download target location"))
)
$ProgressPreference = 'SilentlyContinue'
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
try {
Write-Host "Downloading from cached location ($CachedUrl) to $Destination"
if ($CachedUrl.StartsWith("http")) {
@@ -153,10 +129,10 @@ function Is64BitWinHost
return [environment]::Is64BitOperatingSystem
}
function isProxyEnabled {
function IsProxyEnabled {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable
}
function getProxy {
function Get-Proxy {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
}

View File

@@ -43,3 +43,5 @@ if (Is64BitWinHost) {
Set-EnvironmentVariable "CI_ICU_PATH_Mingw49" "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1"
}
Write-Output "ICU = $version" >> ~\versions.txt

View File

@@ -1,9 +1,13 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\jom_1_1_2.zip"
$version = "1_1_2"
$zip = Get-DownloadLocation "jom_$version.zip"
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.ci.local/input/windows/jom_$version.zip $zip
Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
Extract-Zip $zip C:\Utils\Jom
Extract-7Zip $zip C:\Utils\Jom
Set-EnvironmentVariable "CI_JOM_PATH" "C:\Utils\Jom"
$version = $version.replace('_','.')
Write-Output "Jom = $version" >> ~/versions.txt

View File

@@ -1,80 +1,81 @@
param(
[Int32]$archVer=32,
[string]$toolchain="vs2015"
[string]$toolchain="vs2015",
[bool]$setDefault=$true
)
. "$PSScriptRoot\helpers.ps1"
$libclang_version="6.0"
Write-Output "libClang = $libclang_version" >> ~/versions.txt
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 3.9 or higher is required for building.
# Starting from Qt 5.11 QDoc requires Clang to parse C++
Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
$var = $_.Split('=')
New-Variable -Name $var[0] -Value $var[1]
$libclang_version = $libclang_version -replace '["."]'
}
$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
$libclang_version = $libclang_version -replace '["."]'
$zip = "c:\users\qt\downloads\libclang.7z"
$baseDestination = "C:\Utils\libclang-" + $libclang_version
function install() {
function setURL() {
$script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
}
param(
[string]$sha1=$1,
[string]$destination=$2
)
if ( $toolchain -eq "vs2015" ) {
if ( $archVer -eq 64 ) {
$sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
$destination = $baseDestination + "-64"
$zip = "c:\users\qt\downloads\libclang.7z"
setURL
Download $url $url $zip
Verify-Checksum $zip $sha1
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
$script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
}
$archVer=32
$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
$destination = $baseDestination + "-32"
setURL
Download $url $url $zip
Download $OfficialUrl $CachedUrl $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
}
$toolchainSuffix = ""
if ( $toolchain -eq "vs2015" ) {
if ( $archVer -eq 64 ) {
$sha1 = "a399af949271e6d3bfc578ea2c17ff1d6c6318b9"
$destination = $baseDestination + "-64"
install $sha1 $destination
}
$archVer=32
$sha1 = "aa3f68f1cfa87780a4631a98ce883d3d9cb94330"
$destination = $baseDestination + "-32"
install $sha1 $destination
$toolchainSuffix = "msvc"
}
if ( $toolchain -eq "mingw" ) {
if ( $archVer -eq 64 ) {
$sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818"
$sha1 = "b382502f82d1cfa7d3cc3016d909d37edc19c22c"
$destination = $baseDestination + "-64"
setURL
Download $url $url $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
install $sha1 $destination
}
$archVer=32
$sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3"
$sha1 = "cbc68e0f93f4cb0ed7084a045b7c07a1980a2a44"
$destination = $baseDestination + "-32"
setURL
Download $url $url $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
install $sha1 $destination
$toolchainSuffix = "mingw"
}
Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
Write-Output "libClang = $libclang_version" >> ~/versions.txt
if ( $setDefault ) {
Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
}
Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
if ( $libclang_version -eq "60" ) {
# This is a hacked static build of libclang which requires special
# handling on the qdoc side.
Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"
}

View File

@@ -35,7 +35,7 @@
. "$PSScriptRoot\helpers.ps1"
$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z"
$archive = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z"
$libusb_location = "C:\Utils\libusb-1.0"
Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
@@ -45,3 +45,5 @@ Extract-7Zip $archive $libusb_location
# Tell qt-apps/qdb build system where to find libusb
Set-EnvironmentVariable "LIBUSB_PATH" $libusb_location
Write-Output "libusb = libusb-1.0.21" >> ~/versions.txt

View File

@@ -35,20 +35,21 @@
$version = "11_2_2"
$package = "C:\Windows\temp\opengl32sw.7z"
$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1"
$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z"
$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z"
$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
function Extract-Mesa
{
Param (
[string]$downloadUrl,
[string]$downloadUrlCache,
[string]$downloadUrlAlt,
[string]$sha1,
[string]$targetFolder
)
Write-Host "Installing Mesa from $downloadUrl to $targetFolder"
Write-Host "Downloading $downloadUrl to $package"
Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $package
Download $downloadUrlAlt $downloadUrlCache $package
Verify-Checksum $package $sha1
Extract-7Zip $package $targetFolder
Write-Host "Removing $package"
@@ -56,9 +57,10 @@ function Extract-Mesa
}
if (Is64BitWinHost) {
Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32"
Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
Extract-Mesa $mesaOpenglUrl_64_cache $mesaOpenglUrl_64_alt $mesaOpenglSha1_64 "C:\Windows\System32"
Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
} else {
Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"
Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\system32"
}
Write-Output "Mesa llvmpipe = $version" >> ~/versions.txt

View File

@@ -3,7 +3,7 @@
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -34,16 +34,18 @@
. "$PSScriptRoot\helpers.ps1"
Write-Host "MQTT: Downloading Paho test broker..."
$zip = "c:\users\qt\downloads\pahotest.zip"
$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
$sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
$zip = Get-DownloadLocation "pahotest.zip"
$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e"
$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233"
$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1
Write-Host "MQTT: Installing $zip..."
Extract-Zip $zip C:\Utils
Extract-7Zip $zip C:\Utils
Remove-Item -Path $zip
Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py"
Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-$commitSHA\interoperability\startbroker.py"

View File

@@ -38,13 +38,13 @@ $version = "2013 Update 5 (KB2829760)"
$package = "C:\Windows\Temp\vs12-kb2829760.exe"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
Write-Output "Fetching patch for Visual Studio $version..."
Write-Host "Fetching patch for Visual Studio $version..."
Copy-Item $url_cache $package
Write-Output "Installing Update 5 for Visual Studio $version..."
Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait
Write-Host "Installing Update 5 for Visual Studio $version..."
Run-Executable "$package" "/norestart /passive"
Write-Output "Removing $package ..."
Write-Host "Removing $package ..."
Remove-Item $package
Write-Output "Visual Studio = $version" >> ~\versions.txt

View File

@@ -63,3 +63,5 @@ Write-Host "Installing patch for Visual Studio $version..."
Run-Executable $executable "/norestart /passive"
Remove-Item -Force -Recurse -Path $toRemove
Write-Output "Visual Studio = $version" >> ~\versions.txt

View File

@@ -37,8 +37,11 @@
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "5.6.11"
$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
$baseNameX64 = "mysql-$version-winx64"
$packagex64 = "C:\Windows\temp\$baseNameX64.zip"
$baseNameX86 = "mysql-$version-win32"
$packagex86 = "C:\Windows\temp\$baseNameX86.zip"
$installFolder = "C:\Utils\my_sql"
function DownloadAndInstall
{
@@ -52,7 +55,7 @@ function DownloadAndInstall
Copy-Item $internalUrl $package
$zipDir = [io.path]::GetFileNameWithoutExtension($package)
Extract-Dev-Folders-From-Zip $package $zipDir $installPath
Extract-7Zip $package $installPath "$zipDir\lib $zipDir\bin $zipDir\share $zipDir\include"
Remove-Item -Path $package
}
@@ -60,28 +63,21 @@ function DownloadAndInstall
if (Is64BitWinHost) {
# Install x64 bit version
$architecture = "x64"
$installFolder = "C:\Utils\my_sql\my_sql"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
DownloadAndInstall $internalUrl $packagex64 $installFolder
Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\include"
Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\lib"
Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\$baseNameX64\include"
Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\$baseNameX64\lib"
}
# Install x86 bit version
$architecture = "x86"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
if (Is64BitWinHost) {
$installFolder = "C:\Utils\my_sql\my_sql$architecture"
} else {
$installFolder = "C:\Utils\my_sql\my_sql"
}
DownloadAndInstall $internalUrl $packagex86 $installFolder
Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\include"
Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\lib"
Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\$baseNameX86\include"
Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\$baseNameX86\lib"
# Store version information to ~/versions.txt, which is used to print version information to provision log.
Write-Output "MySQL = $version" >> ~/versions.txt

View File

@@ -1,11 +1,13 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip"
$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
Extract-Zip $zip C:\Utils\Ninja
Extract-7Zip $zip C:\Utils\Ninja
Remove-Item -Path $zip
Add-Path "C:\Utils\Ninja"
Write-Output "Ninja = 1.6.0" >> ~/versions.txt

View File

@@ -0,0 +1,59 @@
#############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
$zip = Get-DownloadLocation "uasdkcpp.zip"
$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022"
$installLocation = "C:\Utils\uacpp"
Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
$internalUrl = "http://ci-files01-hki.ci.local/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip"
# No public download link exists
$externalUrl = $internalUrl
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1
Write-Host "UACPPSDK: Installing $zip..."
Extract-7Zip $zip (Get-DefaultDownloadLocation)
Remove-Item -Path $zip
$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.exe"
$arguments = "/S /D=$installLocation"
Run-Executable $executable $arguments
Write-Host "UACPPSDK: Installer done."
Remove-Item $executable
Write-Host "Set environment variable for COIN to locate SDK"
Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation"

View File

@@ -0,0 +1,265 @@
#############################################################################
##
## 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$
##
#############################################################################
Param (
[string]$targetCommand= ""
)
. "$PSScriptRoot\helpers.ps1"
## Variables for builds
$commitSHA = "215651ab8db94e5eacdd10ec26a5a9fb96b9301f"
$sha1 = "8d899f986071525be73e1ee8565b28ea10536d7d"
$extractTarget = "C:\open62541_build"
function CreateArchive
{
param(
[string]$sourceDirectory=$(throw("You must specify a directory")),
[string]$archiveName=$(throw("You must specify an archive name"))
)
if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
$zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
if (-not (test-path $zipExe)) {
$zipExe = "C:\Utils\sevenzip\7z.exe"
if (-not (test-path $zipExe)) {
throw "Could not find 7-zip."
}
}
} else {
$zipExe = "7z.exe"
}
Run-Executable $zipExe "a -y `"$archiveName`" `"$sourceDirectory`""
}
function PrepareRepository
{
$username = $env:USERNAME
$zip = "c:\users\$username\downloads\open62541.zip"
$externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip"
$internalUrl = "http://ci-files01-hki.ci.local/input/open62541/$commitSHA.zip"
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip $extractTarget
}
function PushDevEnvironment
{
# Provisioning updates the registry entries for PATH etc. However, they are not
# propagated to the next provisioning script and hence need to be manually
# read / set.
$adaptedPath = $env:PATH
$jomLocation = [Environment]::GetEnvironmentVariable("CI_JOM_PATH", "Machine")
$adaptedPath = $adaptedPath + ";" + $jomLocation
$adaptedPath = $adaptedPath + ";" + "C:\Python27"
$adaptedPath = $adaptedPath + ";" + "C:\CMake\bin"
[Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
}
function MSVCEnvironment
{
Param (
[string]$msvcDir=$(throw("No VS Directory specified")),
[string]$msvcbat=$(throw("No vsvars batch file specified"))
)
Push-Location $msvcDir
cmd /c "$msvcbat&set" |
foreach {
if ($_ -match "=") {
$v = $_.split("="); Set-Item -force -path "ENV:\$($v[0])" -value "$($v[1])"
}
}
Pop-Location
}
function BuildAndInstallOpen62541
{
Param (
[string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
[string]$Platform=$(throw("You must specify the target platform [x86, x64]")),
[string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]"))
)
Write-Host "### Open62541: Supposed to build with: $Type $Platform $MakeCommand"
## Make Build directory
$buildDir = "$extractTarget\open62541-$commitSHA\build" + "_" + $Type + "_" + $Platform
if (Test-Path $buildDir) {
Write-Host " Deleting pre-existing build directory"
Remove-Item $buildDir -Force -Recurse
}
New-Item -ItemType Directory -Force -Path $buildDir
Push-Location $buildDir
## Invoke Cmake
$makeGenerator = "NMake Makefiles JOM"
$installTarget = "C:\Utils\open62541" + "_" + $Type + "_" + $Platform
if (Test-Path $installTarget) {
Write-Host " Deleting pre-existing install directory"
Remove-Item $installTarget -Force -Recurse
}
if ($Type.StartsWith("mingw")) {
$makeGenerator = "MinGW Makefiles"
}
cmake -G "$makeGenerator" -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=$installTarget -DLIB_INSTALL_DIR:PATH=$installTarget/lib ..
## Call build command
Write-Host "### Open62541: Compilation ###"
Run-Executable $MakeCommand
## call install command
Write-Host "### Open62541: Installation ###"
Run-Executable $MakeCommand install
$platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform + "_PREFIX"
Set-EnvironmentVariable $platformVariable $installTarget
## Packaging
Push-Location "C:\Utils"
$archiveName = "open62541_" + $Type + "_" + $Platform + ".7z"
CreateArchive $installTarget $archiveName
Pop-Location
## cleanup build directory
Write-Host "### Open62541: Cleanup ###"
Pop-Location
Remove-Item $buildDir -Force -Recurse
}
function DownloadAndInstall
{
Param (
[string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
[string]$Platform=$(throw("You must specify the target platform [x86, x64]"))
)
$baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/"
$targetName = "open62541_" + $Type + "_" + $Platform
$archiveName = $targetName + ".7z"
$downloadUrl = $baseLocation + $archiveName
# Download
$downloadTarget = "C:\Utils\" + $archiveName
Download $downloadUrl $downloadUrl $downloadTarget
# Extract
Push-Location C:\Utils
Extract-7Zip $downloadTarget C:\Utils
Pop-Location
# Set environment variable
$platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform
$platformPath = "C:\Utils\" + $targetName
Set-EnvironmentVariable $platformVariable $platformPath
}
##############################
# Startup #
##############################
if ($targetCommand.StartsWith("mingw")) {
Write-Host "### Creating Open62541 for MinGW"
$mingwPath = [Environment]::GetEnvironmentVariable($targetCommand, "Machine")
if (!$mingwPath) {
throw("Could not find mingw")
}
# Strawberry has its own gcc, put mingw in front
$adaptedPath = $mingwPath + "\bin;" + [Environment]::GetEnvironmentVariable("PATH", "Machine")
[Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
PushDevEnvironment
BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make"
} elseif ($targetCommand -eq "msvc2015_x86") {
Write-Host "### Creating Open62541 for MSVC2015 x86"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86"
PushDevEnvironment
BuildAndInstallOpen62541 msvc2015 x86 jom
} elseif ($targetCommand -eq "msvc2015_x64") {
Write-Host "### Creating Open62541 for MSVC2015 x64"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64"
PushDevEnvironment
BuildAndInstallOpen62541 msvc2015 x64 jom
} elseif ($targetCommand -eq "msvc2017_x86") {
Write-Host "### Creating Open62541 for MSVC2017 x86"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars32.bat
PushDevEnvironment
BuildAndInstallOpen62541 msvc2017 x86 jom
} elseif ($targetCommand -eq "msvc2017_x64") {
Write-Host "### Creating Open62541 for MSVC2017 x64"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars64.bat
PushDevEnvironment
BuildAndInstallOpen62541 msvc2017 x64 jom
} elseif ($targetCommand -eq "prepare") {
PrepareRepository
} elseif ($targetCommand -eq "build") {
Write-Host "### Building for all supported platforms"
PrepareRepository
Write-Host "### Invoking MinGW530 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530
Write-Host "### Invoking MinGW630 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630
Write-Host "### Invoking MinGW730 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730
Write-Host "### Invoking MSVC2015 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64
Write-Host "### Invoking MSVC2017 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x86
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x64
Write-Host "### Archives have been generated at C:/Utils. Please upload manually"
} elseif ($targetCommand -eq "packaged") {
Write-Host "### Expecting pre-built packages, download and install from archives"
Write-Host "### MinGW530 x64"
DownloadAndInstall mingw530 x86
Write-Host "### MinGW630 x64"
DownloadAndInstall mingw630 x86
Write-Host "### MinGW730 x64"
DownloadAndInstall mingw730 x64
Write-Host "### MSVC2015 x86"
DownloadAndInstall msvc2015 x86
Write-Host "### MSVC2015 x64"
DownloadAndInstall msvc2015 x64
Write-Host "### MSVC2017 x64"
DownloadAndInstall msvc2017 x64
} elseif ($targetCommand) {
Write-Host "### Unknown parameter specified:" $targetCommand " Options are: mingw, msvc2015_x(86/64), msvc2017_x(86/64)"
throw("Unknown parameter")
} else {
# Default behavior
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand build
}

View File

@@ -36,7 +36,7 @@
# This script installs OpenSSL $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "1_0_2j"
$version = "1_0_2p"
$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
$installFolder = "C:\openssl"
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
$sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86

View File

@@ -43,7 +43,7 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
if (Is64BitWinHost) {
# Install x64 bit versions
$architecture = "x64"
$installFolder = "C:\Utils\postgresql\pgsql"
$installFolder = "C:\Utils\postgresql"
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
@@ -52,13 +52,13 @@ if (Is64BitWinHost) {
Download $externalUrl $internalUrl $packagex64
Verify-Checksum $packagex64 $sha1
Write-Host "Installing $packagex64 ..."
Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
Extract-7Zip $packagex64 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
Write-Host "Remove downloaded $packagex64 ..."
Remove-Item -Path $packagex64
Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\include"
Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\lib"
Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include"
Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib"
}
# Install x86 bit version
@@ -67,9 +67,9 @@ $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windo
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip"
$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
if (Is64BitWinHost) {
$installFolder = "C:\Utils\postgresql$architecture\pgsql"
$installFolder = "C:\Utils\postgresql$architecture"
} else {
$installFolder = "C:\Utils\postgresql\pgsql"
$installFolder = "C:\Utils\postgresql"
}
@@ -77,13 +77,13 @@ Write-Host "Fetching from URL..."
Download $externalUrl $internalUrl $packagex86
Verify-Checksum $packagex86 $sha1
Write-Host "Installing $packagex86 ..."
Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
Extract-7Zip $packagex86 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
Write-Host "Remove downloaded $packagex86 ..."
Remove-Item -Path $packagex86
Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\include"
Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\lib"
Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include"
Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib"
# Store version information to ~/versions.txt, which is used to print version information to provision log.
Write-Output "PostgreSQL = $version" >> ~/versions.txt

View File

@@ -3,7 +3,7 @@
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -30,13 +30,17 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script installs Python $version.
# Python is required for building Qt 5 from source.
param(
[Int32]$archVer=32,
[string]$targetDir="C:\Python27"
)
. "$PSScriptRoot\helpers.ps1"
$version = "2.7.13"
if (Is64BitWinHost) {
if ( $archVer -eq 64 ) {
$arch = ".amd64"
$sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
} else {
@@ -51,21 +55,35 @@ Write-Host "Fetching from URL..."
Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
Write-Host "Installing $package..."
Run-Executable "msiexec" "/passive /i $package ALLUSERS=1"
Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1"
# We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
Write-Host "Changing allowZip64 value to 'True'..."
(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py
(Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py
Write-Host "Remove $package..."
Remove-Item -Path $package
Add-Path "C:\Python27;C:\Python27\Scripts"
# When installing 32 bit python to 64 bit host, we want to keep only default python in path
# For cross-compilation we export some helper env variable
if (($archVer -eq 32) -And (Is64BitWinHost)) {
Set-EnvironmentVariable "PYTHON2_32_PATH" "$targetDir"
Set-EnvironmentVariable "PIP2_32_PATH" "$targetDir\Scripts"
} else {
Add-Path "$targetDir;$targetDir\Scripts"
}
Run-Executable "C:\Python27\python.exe" "-m ensurepip"
Run-Executable "$targetDir\python.exe" "-m ensurepip"
# Install python virtual env
#if (isProxyEnabled) {
# Write-Host "Using proxy with pip"
# $pip_args = "--proxy=" + (getProxy)
#}
Run-Executable "C:\Python27\Scripts\pip.exe" "install virtualenv"
if (IsProxyEnabled) {
$proxy = Get-Proxy
Write-Host "Using proxy ($proxy) with pip"
$pip_args = "--proxy=$proxy"
}
Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install virtualenv"
# Install PyPDF2 for QSR documentation
Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install PyPDF2"
Write-Output "Python-$archVer = $version" >> ~/versions.txt

View File

@@ -4,7 +4,7 @@
## Copyright (C) 2017 Pelagicore AG
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -32,18 +32,20 @@
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script installs Python $version.
# Python3 is required for building some qt modules.
param(
[Int32]$archVer=32,
[string]$install_path = "C:\Python36"
)
. "$PSScriptRoot\helpers.ps1"
$version = "3.6.1"
$package = "C:\Windows\temp\python-$version.exe"
$install_path = "C:\Python36"
# check bit version
if (Is64BitWinHost) {
Write-Host "Running in 64 bit system"
if ( $archVer -eq 64 ) {
Write-Host "Installing 64 bit Python"
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe"
$sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff"
@@ -61,12 +63,31 @@ Run-Executable "$package" "/q TargetDir=$install_path"
Write-Host "Remove $package..."
Remove-Item -Path $package
Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
# For cross-compilation we export some helper env variable
if (($archVer -eq 32) -And (Is64BitWinHost)) {
Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts"
} else {
Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
}
# Install python virtual env
#if (isProxyEnabled) {
# Write-Host "Using proxy with pip"
# $pip_args = "--proxy=" + (getProxy)
#}
Run-Executable "$install_path\Scripts\pip3.exe" "install virtualenv"
if (IsProxyEnabled) {
$proxy = Get-Proxy
Write-Host "Using proxy ($proxy) with pip"
$pip_args = "--proxy=$proxy"
}
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel"
# Install all needed packages in a special wheel cache directory
$python3_wheel_dir="$install_path\python3-wheels"
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args wheel --wheel-dir $python3_wheel_dir -r $PSScriptRoot\..\shared\requirements.txt"
Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir"
# Install PyPDF2 for QSR documentation
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2"
Write-Output "Python3-$archVer = $version" >> ~/versions.txt

View File

@@ -35,7 +35,7 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt"
$n = $n.Split('=')
New-Variable -Name $n[0] -Value $n[1]
if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) {
if ([string]::IsNullOrEmpty($proxy)) {
Write-Host "No proxy is defined."
} else {
Write-Host "Checking proxy @ $proxy"

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.
@@ -38,16 +38,18 @@
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
$version = "6.3.0"
$version = "6.3.2"
# Qt branch without dot (*.*)
$qtBranch = "59x"
# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point
$qtBranch = "510x"
# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
$targetDir = "C:\Utils\squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
$squishBranchUrl = "$squishUrl\$qtBranch"
$testSuite = "suite_test_squish"
$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
# Squish license
$licensePackage = ".squish-3-license"
@@ -77,9 +79,13 @@ Function DownloadAndInstallSquish {
$squishPackage64bit = "$squishPackage`_64"
}
Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
TestSquish $squishPackage64bit
} else {
if ($squishPackage.StartsWith("mingw")) {
Rename-Item $targetDir\$squishPackage $targetDir\mingw
TestSquish mingw
} else {
TestSquish $squishPackage
}
}
}
@@ -93,10 +99,27 @@ Function DownloadSquishLicence {
Copy-Item $squishUrl\$licensePackage ~\$licensePackage
}
Function TestSquish {
Param (
[string]$squishPackage
)
Write-Host "Verifying Squish Installation"
if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") {
Write-Host "Squish installation tested successfully!"
} else {
Write-Host "Squish test failed! $squishPackage wasn't installed correctly."
[Environment]::Exit(1)
}
}
Write-Host "Creating $targetDir"
New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir"
Write-Host "Download and install Test Suite for squish"
Copy-Item $testSuiteUrl $targetDir/$testSuite.7z
Extract-7Zip $targetDir/$testSuite.7z $targetDir
DownloadSquishLicence $squishUrl
if ($OSVersion -eq "Windows 10 Enterprise") {

View File

@@ -32,6 +32,8 @@
#############################################################################
Write-Host "Disabling proxy"
# A bit-mask is needed to disable "Automatically detect settings" from LAN
# settings that disturb and re-enable proxy even after disabling it.
$dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections").DefaultConnectionSettings
$dcs[8] = $_ -band 0xF7
Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs

View File

@@ -4,7 +4,7 @@
## Copyright (C) 2017 Pelagicore AG
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage

View File

@@ -0,0 +1,23 @@
. "$PSScriptRoot\helpers.ps1"
function Install-VCLibsDebug
{
Param (
[string]$Arch
)
$installedPackage = Get-AppxPackage Microsoft.VCLibs.140.00.Debug | Where-Object {$_.Architecture -eq $Arch}
if ($installedPackage) {
Write-Host "Debug VCLibs already installed for $Arch."
return
}
if (Is64BitWinHost) {
$ProgramFiles = "Program Files (x86)"
} else {
$ProgramFiles = "Program Files"
}
Add-AppxPackage "C:\$ProgramFiles\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx"
Write-Host "Debug VCLibs successfully installed for $Arch."
}

View File

@@ -0,0 +1,50 @@
############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will install Windows 10 SDK
$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\winsdksetup.exe"
$url_official = "https://download.microsoft.com/download/8/C/3/8C37C5CE-C6B9-4CC8-8B5F-149A9C976035/windowssdk/winsdksetup.exe"
$package = "C:\Windows\Temp\winsdksetup.exe"
$sha1 = "db237323f1779fb143e7cdc558e4345e7004489e"
Copy-Item $url_cache $package
Verify-Checksum $package $sha1
Run-Executable $package "/features + /q"
Write-Host "Cleaning $package.."
Remove-Item -Recurse -Force -Path "$package"
Write-Output "Windows 10 SDK = 10.0.16229.91" >> ~\versions.txt

View File

@@ -1,11 +1,12 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\winrtrunner.zip"
$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip"
$zip = Get-DownloadLocation "winrtrunner.zip"
$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner_2018-07-06.zip"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winrtrunner\winrtrunner_2018-07-06.zip"
Download $url $url $zip
Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42"
Extract-Zip $zip C:\Utils\winrtrunner
Download $url $url_cache $zip
Verify-Checksum $zip "93548e8c3fb8fded2474996ef5e0163f489ce8cf"
Extract-7Zip $zip C:\Utils\winrtrunner
Remove-Item -Path $zip
Set-EnvironmentVariable "CI_WINRTRUNNER_PATH" "C:\Utils\winrtrunner"

View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
# shellcheck source=../common/linux/disable-mlocate.sh
"$BASEDIR/../common/linux/disable-mlocate.sh"

View File

@@ -1,10 +0,0 @@
#!/usr/bin/env bash
# provides: fix for possible bug in the subscription manager
# version: provided by RedHat
# needed for yum to work properly in case there is incorrect data in
# the sslclientkey repository parameter value
set -ex
sudo rm -f /etc/pki/entitlement/*
sudo subscription-manager refresh

View File

@@ -1,8 +0,0 @@
#!/usr/bin/env bash
# provides: odbc devel packages on RHEL
# version: provided by default Linux distribution repository
# needed for configure -plugin-sql-odbc in qtbase
set -ex
sudo yum install -y unixODBC-devel

View File

@@ -1,11 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/shared/sw_versions.txt
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

View File

@@ -1,17 +0,0 @@
#!/usr/bin/env bash
# provides: python development libraries
# version: provided by default Linux distribution repository
# needed to build pyside
set -ex
sudo yum install -y python-devel python-virtualenv
# install python3
sudo yum install -y python34-devel
# install pip3
wget https://bootstrap.pypa.io/get-pip.py
sudo python3 get-pip.py
sudo rm -f get-pip.py
sudo pip3 install virtualenv

View File

@@ -1,4 +0,0 @@
#!/usr/bin/env bash
set -ex
$(dirname $0)/../common/linux/cmake_linux.sh

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env bash
# Required for tqtc-boot2qt/qdb
set -ex
sudo yum install -y libusb1-devel

View File

@@ -1,73 +0,0 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script installs the right ICU version
set -ex
icuVersion="56.1"
icuLocation="/usr/lib64"
sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
function Install7ZPackageFromURL {
url=$1
expectedSha1=$2
targetDirectory=$3
targetFile=`mktemp`
wget --tries=5 --waitretry=5 --output-document=$targetFile $url
echo "$expectedSha1 $targetFile" | sha1sum --check
sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile
rm $targetFile
}
echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
echo "Installing custom ICU devel packages on RHEL"
sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
tempDir=`mktemp -d`
trap "sudo rm -fr $tempDir" EXIT
Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
sudo cp -a $tempDir/lib/* /usr/lib64
sudo cp -a $tempDir/* /usr/
sudo /sbin/ldconfig
# Storage version information to ~/versions.txt, which is used to print version information to provision log.
echo "ICU = $icuVersion" >> ~/versions.txt

View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
# shellcheck source=../common/linux/disable-mlocate.sh
"$BASEDIR/../common/linux/disable-mlocate.sh"

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