lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 01:36:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,245 Commits 120 Branches 272 Tags
fb47ba71e9f0a80d9def6bb1f73d5c7b1663c00d
Commit Graph

3245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Qt Submodule Update Bot
2863cdc7aa Update submodules on '5.11' in qt5 
Change-Id: I4327f5eef196cdad0ea41c7e2b8e59ccaa637582
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-16 10:07:34 +00:00
Qt Submodule Update Bot
d30c0366db Update submodules on '5.11' in qt5 
Change-Id: I4a586ab957fc68b0afb2334048040e01f398a07b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-13 08:53:14 +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>
v5.12.0-beta2 		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
Qt Submodule Update Bot
e05e24aa18 Update submodules on '5.11' in qt5 
Change-Id: I0c458253ebe502ad13b40c6dda619ec9779e675e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-10-09 13:15:18 +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>
v5.12.0-beta1 		2018-10-03 17:58:05 +00:00
Qt Submodule Update Bot
f0f31335e9 Update submodules on '5.11' in qt5 
Change-Id: If72a35b56e4f1a1c102f60d2db543dd07c525dcd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-03 04:31:14 +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
Qt Submodule Update Bot
0e4743cabf Update submodules on '5.11' in qt5 
Change-Id: Ie4b2b37794d3cfad7da7c7449d287369c5b6315b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-27 08:57:36 +00:00
Qt Submodule Update Bot
1ce244fec0 Update submodules on '5.11' in qt5 
Change-Id: Iff73075fe2038d7d1f7fc0853723004b263e994a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-26 10:30:13 +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