lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,778 Commits 118 Branches 270 Tags
ec79fbe5ec44600d5bbfab6da029244d12b933dc
Commit Graph

3778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
ec79fbe5ec Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I45dd7a0b0a93a35aa3f528617efeaa2859f9ce6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-04 08:41:15 +00:00
Alexandru Croitor
8c94279a59 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Id725f04bc4753fc68a9bbb2762beb2c5f4eb9d84
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-03 16:48:34 +00:00
Qt Submodule Update Bot
d7a4a50e2d Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ia5837cb7f71ea98b280b66998f7a3624750dde6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-12-03 05:52:31 +00:00
Qt Submodule Update Bot
096fd23eb8 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I0a261abad505b2f2724f0a15a10708b67129ffbf
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-29 17:43:05 +00:00
Liang Qi
bdaf92aa41 Correct branches for .gitmodules 
This amends eabc1ed5bd.

Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-29 15:55:39 +00:00
Liang Qi
61ffa2778f Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Id0fb114e7d4e4bc66d8a51e91ebc8de166229fb6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-29 15:44:24 +00:00
Liang Qi
95c7b90309 Update CMake to version 3.16.0-rc4 
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-29 10:00:50 +00:00
Liang Qi
63c515a6cb Merge remote-tracking branch 'origin/dev' into wip/cmake 
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsaferenderer.yaml

Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
 2019-11-28 19:44:30 +01:00
Liang Qi
0d6ae070f4 Update submodules on 'dev' in qt/qt5 
Only qtwebengine and qtmultimedia this round.

Change-Id: If5f67c96d26d7721fdb350bb27fbea82aced8e14
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-27 06:10:06 +01:00
Leander Beernaert
3ba8bdeda0 Update qt5.git 
Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-11-25 16:40:40 +00:00
Liang Qi
86b9edca68 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml

Change-Id: I1f6b8dff622c3899b2d655108f638404b3bc2189
 2019-11-22 17:26:28 +01:00
Liang Qi
b5c9819be2 Update submodules on '5.15' in qt/qt5 
Only qtmultimedia this round.

Change-Id: I00a94d159457f50a70a9b9eddedd3efd56870e51
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-21 18:42:57 +01:00
Liang Qi
f9183e71bf Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
 2019-11-20 07:29:43 +01:00
Heikki Halmet
dcfef7226f Provisioning: Change JDK script to use 'Remove' function from helpers 
Task-number: QTQAINFRA-3369
Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-20 08:08:10 +02:00
Heikki Halmet
0335e9c4e5 Provisioning: Remove shell scripts under windows 
Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-20 09:08:04 +03:00
Heikki Halmet
601a9d39b2 Provisioning: Install python modules needed by packaging 
Needed by packaging scripts

Task-number: COIN-214
Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
 2019-11-20 08:07:58 +02:00
Liang Qi
edb5ebfb7e Update submodules on '5.14' in qt/qt5 
Change-Id: Ia052f103935e8451e10258315370009b9b24f596
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-20 07:07:48 +01:00
Liang Qi
6d7ae7ebe1 Merge remote-tracking branch 'origin/5.13' into 5.14 
Conflicts:
	coin/provisioning/common/linux/docker.sh

Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
 2019-11-18 19:21:53 +01:00
Heikki Halmet
d8eaed9b09 Provisioning: Update Android NDK version to r20 for macOS 10.14 
Task-number: QTQAINFRA-3337
Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
 2019-11-18 14:23:08 +02:00
Qt Submodule Update Bot
a72db33bfc Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ia7d77b5f456e4e6196cacc179952e104476d968f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-16 21:42:42 +00:00
Alexandru Croitor
eabc1ed5bd Add a few more ported repos to qt5.git wip/cmake 
Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-15 13:02:52 +00:00
Jani Heikkinen
5d5ef9c32b Enable dSYM files for release builds in macOS 
Same flag is used in windows and linux ones and it seems that is needed
to enable dSYM files for release builds

Task-number: QTBUG-3934
Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2019-11-15 06:22:55 +02:00
Tor Arne Vestbø
6bf7a970e7 Use Xcode 11 on macOS 10.14 
Fixes: QTQAINFRA-3261
Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-14 20:04:33 +00:00
Tor Arne Vestbø
40cca42c39 Use macOS 10.14 to build iOS/tvOS/watchOS 
Allows us to (as a follow-up) use Xcode 11.

Change-Id: I799732eee35eea3db83e568d26ded6e7ae1df53d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-14 20:08:00 +01:00
Qt Submodule Update Bot
3903c2a72d Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I28901d350b1f16b9a6b3d9776ee8055ea3356ade
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-11-14 14:55:50 +00:00
Qt Submodule Update Bot
4728ffb620 Update submodules on '5.13' in qt/qt5 
Change-Id: I7ba7a20377d5fbe2b390ec1aeed82e74eb974eba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-14 08:46:24 +01:00
Dimitrios Apostolou
ef7481b9cd Workaround broken local apt mirror 
Local mirror is mirroring a public mirror, and for some reason there is
a mismatch of file sizes and file hashes for the dep-11 metadata files.

More info:
https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files

Task-number: QTQAINFRA-3351
Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-14 08:46:22 +01:00
Dimitrios Apostolou
33d2547817 Keep debug trace off to avoid polluting the logs 
Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-14 08:46:20 +01:00
Dimitrios Apostolou
a270bcdb6b Docker installation: do not depend on external repositories 
Also updated the docker-compose binary to the latest one.

Task-number: QTQAINFRA-3279
Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-14 08:46:18 +01:00
Dimitrios Apostolou
fafd3d655d Fix cache URL for telegraf windows package 
Fixes: QTQAINFRA-3340
Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-11-14 08:46:16 +01:00
Dimitrios Apostolou
6cc2215b8c DownloadURL last argument (targetFile) is now optional 
Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-14 08:46:14 +01:00
Qt Submodule Update Bot
df8310ced1 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I26274b1707fd4d12a4da5503b9a414414f29148b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-13 21:25:12 +00:00
Simon Hausmann
1aa25c1084 Bump vcpkg to a new snapshot 
Some patches were upstreamed and this beings the version in line with
what we need for Android. This patch also centralizes the version into a
shared file, for future use.

Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-13 09:57:53 +00:00
Leander Beernaert
8eab11f696 Update CMake to version 3.15.5 
Update required as there's a bug with setting the CXX_STANDARD on
android. Updating to this version fixes the issue.

Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-12 13:27:23 +00:00
Heikki Halmet
569fd1dabc Provisioning: Install pre-builded openssl for Windows 7 
Task-number: QTQAINFRA-3224
Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-12 07:09:49 +02:00
Simon Hausmann
c85543f88d Merge remote-tracking branch 'origin/dev' into wip/cmake 
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
 2019-11-11 10:52:16 +01:00
Liang Qi
ae27f21d26 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	coin/platform_configs/default.yaml

Change-Id: Id4af2d72bb409b6851758a726677c2f2235fc0af
 2019-11-08 09:10:04 +01:00
Liang Qi
e4cb75c5ae Update submodules on '5.14' in qt/qt5 
Only qtwebengine this round.

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

Visual studios are updated to versions:

MSVC 2019: version 16.3.1
MSVC 2017: version 15.9.16

Task-number: QTQAINFRA-2875
Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-11-07 21:59:25 +02:00
Qt Submodule Update Bot
4e5a86d2bb Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I140d2692932cc10d4bedd45e149c804ec7329885
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-07 08:08:51 +00:00
Liang Qi
b3f160bc39 Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: I61d236e3d97ffd6e1cea460fba3d0eb2dac1d045
 2019-11-07 08:08:49 +01:00
Qt Submodule Update Bot
ebc02c3265 Update submodules on '5.15' in qt/qt5 
Change-Id: Id30b6ed350ca34593be6649e3671c6d57d99c8d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-07 07:31:11 +01:00
Liang Qi
68189ab965 Merge remote-tracking branch 'origin/5.13' into 5.14 
Conflicts:
	coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
 2019-11-06 14:19:45 +01:00
Qt Submodule Update Bot
98cb5fa965 Update submodules on '5.14' in qt/qt5 
Change-Id: I2d08d87f917232a79ebd9d7691610d61b82727b2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-06 13:35:27 +01:00
Qt Submodule Update Bot
d148d7b0f7 Update submodules on '5.15' in qt/qt5 
Change-Id: I13014018eac8b9bb5fd769e82e987030fc08ad6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-06 07:12:09 +01:00
Tony Sarajärvi
b34681bf02 Remove macOS 10.12 from CI 
Task-number: QTQAINFRA-3342
Change-Id: If617a762b4d65983d2d823ef035d4e5f9e5bc432
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2019-11-05 13:56:46 +00:00
Qt Submodule Update Bot
d939b369d2 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I41c2406329c56d6c82a3d7c27b364adae366b79f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-05 06:09:25 +00:00
Qt Submodule Update Bot
8287111e7b Update submodules on '5.15' in qt/qt5 
Change-Id: I2f00c0e3534f76108e7de3f072cf3ff9bb301a54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-05 06:28:59 +01:00
Matti Paaso
f178318d2f Add new target for installer framework 
Task-number: QTQAINFRA-3284
Change-Id: I3945160f212921b2b30cd39982a808cfc164a1b1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
 2019-11-04 14:46:22 +02:00
Qt Submodule Update Bot
d690f84fd4 Update submodules on '5.13' in qt/qt5 
Change-Id: Ibe25a3e99d09aea840c9e86a403dc1577701eb0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-04 08:42:38 +01:00