lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-03 23:16:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,592 Commits 118 Branches 270 Tags
d1601aa0f94de81fe6b1651a2a3f5ce0a52a1ed3
Commit Graph

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
2d6f569ee9 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: Ia67f4be8c51a2bd0a8a03cb3857dfd57d7eea806
 2019-12-06 10:25:21 +01:00
Liang Qi
4282752c19 Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
 2019-12-05 14:47:57 +01:00
Dimitrios Apostolou
e4f9ac5607 Tag the docker images as "latest" 
We will use this tag in qtbase to refer to the image to run, because
with the current sha1tree() tag, every minor change in the docker images
requires synchronized changes between repositories.

Task-number: QTBUG-79867
Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2019-12-05 09:13:39 +01:00
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
Heikki Halmet
7c1c98e123 Provisioning: Install libpoppler 
Poppler test requires this package

Task-number: QTQAINFRA-3253
Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
 2019-12-03 17:51:21 +02: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
b1de0fedcf Update submodules on '5.14.0' in qt5 
Change-Id: I8b4b971563492f853f802337af7489e2d6323362
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.14.0-rc1 		2019-12-03 05:14:56 +00:00
Liang Qi
4b6c05815a Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: I4dd840681bd84f7aeed58602b0c998c0e5807e10
 2019-12-02 10:27:23 +01:00
Qt Submodule Update Bot
b3da333101 Update submodules on '5.14' in qt/qt5 
Change-Id: I7a09d7b24e5feb97ec891f0a92d35b12dcebde91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-01 22:30:59 +01:00
Jani Heikkinen
827bdae8ef Update submodules on '5.14.0' in qt5 
Update submodules on '5.14.0' in qt5

Change-Id: Ifd79795cba5a9b58f7c89e35f75f6fc6a4e57950
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-12-01 09:21:01 +02: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
Qt Submodule Update Bot
56ad797f42 Update submodules on '5.14' in qt/qt5 
Change-Id: Iaeaf6014ff94eef81ebba7db5ae3de5fa1c4cc2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-27 06:34:45 +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
Jani Heikkinen
2e66078b5e Merge remote-tracking branch 'origin/5.14' into 5.14.0 
Change-Id: Ied8894925be2d31333b99638b480b950128d2e22
 2019-11-27 07:03:16 +02:00
Liang Qi
f064a5b9d2 Update submodules on '5.14' in qt/qt5 
Change-Id: I75cd18c8c09c47c2eee8dd0629d1cccb3b5838e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-26 19:25:29 +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
Simo Fält
9cf8af5248 Provisioning: Remove sudo when installing pip packages for Qt user 
There is no need to install as sudo for qt user. Using sudo will
change the cache dir's permissions preventing us from
installing anything with pip as normal user.

Change-Id: Id45bf3805ce4d772a6c82e429d4e1948289f076e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2019-11-25 13:15:51 +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
Johanna Äijälä
08ded9e2f8 Provisioning: update Squish 
Update with custom build of Squish to be able to launch Qt5.14
applications in RTA tests.

Change-Id: Ic420656852ae885b057de937baabf01135526764
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-11-21 11:26:11 +03: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
Kari Oikarinen
f1cbe1e3b6 Adjust submodule branches 2019-11-14 09:23:14 +02: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