Commit Graph

4592 Commits

Author SHA1 Message Date
Liang Qi
599370a6c4 Update submodules on '5.12' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I3eaa76e386a4d6a6b981a11a2eadd290059cb830
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 17:33:53 +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>
v5.12.0-beta4
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
Oswald Buddenhagen
3bb63c22c4 Adjust submodule branches
Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750
2018-11-02 15:29:23 +01: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
Joni Jäntti
7e67d0e558 Provisioning: RHEL-6.6: Update curl
The currently used version of curl does not support TLS 1.2 or newer.
Since download.qt.io has minimum requirement of TLS 1.2 we need to
update the these packages.

Task-number: QTQAINFRA-2212
Change-Id: I4737443b5b2180a592a18d9095fe3f31063ba329
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-11-02 07:59:24 +00:00
Ryan Chu
9dc75c3a3d Provisioning: Enable Docker-based test servers to macOS_10.12
Build and provision docker images of test servers into the docker-cache.

Relates to qt/qt5 ea76ace825

Change-Id: I3fbdd7a733669935c64575d50c209da9adf51f42
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-01 08:43:14 +00:00
Tony Sarajärvi
b082d7d544 Replace .ci.local addresses with .intra.qt.io in provisioning scripts
Change-Id: I5e5bc084faabb28ffdf0437871445ecb8970bfb3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-01 07:16:57 +00:00
Qt Submodule Update Bot
195799f36c Update submodules on '5.11' in qt5
Change-Id: Id39d804153ed5bd04545fdd5fd90ec3cb7de88cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-01 07:16:52 +00:00
Qt Submodule Update Bot
4eda836c8c Update submodules on 'dev' in qt5
Change-Id: I8920284e859de42a5c7bc5f3828c36bcd6ba5a98
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-01 06:23:35 +00:00
Joni Jantti
37eeb598cc Provisioning: PyPFD2
Required for reading PDF doc files in RTA tests.

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>
(cherry picked from commit bb6a91d5d4)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-31 19:39:10 +00:00
Heikki Halmet
1f07276692 Provisioning: Remove environment variables from androind-openssl
We shouldn't need those anymore.

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

Change-Id: Ic5a588e5cc5e753ec4c4e2e1bc79917bbd03f95d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-10-30 08:15:43 +00:00
Liang Qi
a76e315034 Update submodules on 'dev' in qt5
Change-Id: I1134ae427a2de7bbc08ef000b81e02ded1471bd8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-30 08:15:39 +00:00
Qt Submodule Update Bot
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
Oswald Buddenhagen
1af3c19fc8 commit template: add missing trailing space to Fixes footer
Change-Id: If966752eeebc7044a9a8ba5a2a66b8c03846c771
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-10-29 15:29:44 +00:00
Qt Submodule Update Bot
e6e78d4e36 Update submodules on 'dev' in qt5
Change-Id: Icddbe16baf8cff912e131068e73ca772c7520184
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-26 11:49:09 +00:00
Qt Submodule Update Bot
7ea65aec65 Update submodules on '5.11' in qt5
Change-Id: I2fd329c2d1097b89ab86768927b605af4c6e2a0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-26 10:28:13 +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
26cece9f93 Update submodules on '5.11' in qt5
Change-Id: I71eaf20c20124a8634e715aaee11bc0118a84a23
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 13:26:46 +00:00
Qt Submodule Update Bot
6d23debda8 Update submodules on 'dev' in qt5
Change-Id: I5b4d663b82af33c54a0f93515bd755cb7edec201
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 13:26:33 +00:00
Qt Submodule Update Bot
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
96a07386fb Update submodules on '5.11' in qt5
Change-Id: I7cd87f5de55b09332b9bfcfd5d4532cbc09072fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-23 18:13:07 +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
ab7b56afe6 Update submodules on '5.11' in qt5
Change-Id: I2a43b09d5d15775ed17aaa782bb81741f1e15c1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-22 00:20:14 +00:00
Qt Submodule Update Bot
4480ed8ab8 Update submodules on 'dev' in qt5
Change-Id: Iee06cc029a6322f205b314196fb4a41c52ecbcf3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-22 00:20:07 +00:00
Qt Submodule Update Bot
7d01b06b8f Update submodules on '5.12' in qt5
Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.12.0-beta3
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
Liang Qi
4a8b97d020 Update submodules on 'dev' in qt5
Change-Id: I617a3480a3bc0fe333fe2ace90f1ee00238c9a98
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-21 09:22:35 +00:00
Liang Qi
16c6fa419a Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I34a18e1ea9ca774638ffe65d08d1fee46efba4aa
2018-10-20 14:17:57 +02:00
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
bb1f484318 Update submodules on '5.11' in qt5
Change-Id: Id7020bdeb4cafb5e6fe83fcf8833b882695205c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-19 10:47:06 +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
Qt Submodule Update Bot
0345ab91fb Update submodules on 'dev' in qt5
Change-Id: If9a481665755ad4758d22d3c2f8438e6c5e0c380
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-18 10:09:35 +00:00
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