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,122 Commits 118 Branches 270 Tags
42bfac5bf847cc7505d0bf5be2aff179ed2ed28e
Commit Graph

3122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
42bfac5bf8 Include qtvirtualkeyboard again 
This partially reverts commit 452e0d94d4.

Task-number: QTBUG-76371
Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2019-08-08 14:19:46 +02:00
Tony Sarajärvi
b88acae7a8 Partially revert 'Do DeveloperBuild for Boot2Qt' 
This partially reverts commit 8f073cea69.

Autotests slow down way too much still, so we can't run developers
builds eveywhere.

Task-number: QTBUG-63152
Task-number: QTBUG-77304
Task-number: COIN-326
Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-08 12:19:38 +00:00
Qt Submodule Update Bot
f08bd26eeb Update submodules on '5.12' in qt5 
Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-08 11:45:10 +02:00
Tony Sarajärvi
9da27c5808 Add macOS 10.14 to the CI 
Task-number: QTQAINFRA-2938
Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-03 23:01:34 +03:00
Konstantin Tokarev
125c5e6528 Provisioning: update conan_manifests for libxslt packages 
Package recipe was improved, as a result packages were rebuilt and
checksums need update.

Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-01 14:24:56 +03:00
Konstantin Tokarev
b521ad483c Update platform_configs for QtWebKit 
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-01 14:24:48 +03:00
Jani Heikkinen
30b0d05343 Remove 'Packaging' feature from WinRT_10 x86 
We don't deliver binaries for that target anymore -> do not export that
either

Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 2019-08-01 12:31:28 +03:00
Qt Submodule Update Bot
d3fbd2ed1a Update submodules on '5.12' in qt5 
Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-31 23:31:05 +02:00
Qt Submodule Update Bot
f84c90706d Update submodules on '5.12' in qt5 
Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-28 23:30:53 +02:00
Konstantin Tokarev
716640a477 Provisioning: update Conan and Conan packages 
[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
    packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
    Python 3 and MinGW
[*] Add license header to conan.ps1

Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:45 +03:00
Konstantin Tokarev
4bf0ba2ba1 Provisioning: Add CompilerException and CompilerThreads settings for Conan 
Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:37 +03:00
Konstantin Tokarev
2666f3b216 Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention 
Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:24 +03:00
Konstantin Tokarev
535dbcfe96 Conan: Suppress output of New-Item 
Change-Id: I3d62fffa08d38a383187726e08743512236bb859
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:18 +03:00
Qt Submodule Update Bot
41abae4367 Update submodules on '5.12' in qt5 
Change-Id: I0b682ebd4643a85f04cb2192efb97e8c5230759a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-26 09:59:29 +02:00
Konstantin Tokarev
f12c226463 Provisioning: install-msys2.ps1 must run its commands synchronously 
[*] Using bash instead of msys2_shell.cmd allows Start-Process to actually
    wait for the end of command execution.
[*] cpan requires "yes" to be typed by user when it's run first time,
    otherwise it hangs indefinitely waiting for input.
[*] Stop gpg-agent and dirmngr started in the background to prevent
    CI session from hanging.

Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 07:50:43 +03:00
Konstantin Tokarev
22c427b369 Use msiexec to install Strawberry Perl from msi package 
Currently provisioning fails with following error:  "This command cannot
be run due to the error: %1 is not a valid Win32 application."

Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 07:50:41 +03:00
Konstantin Tokarev
645bd71404 Provisioning: Run-Executable should print stdout and stderr to log 
Task-number: QTQAINFRA-3085
Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 07:50:38 +03:00
Konstantin Tokarev
cb8d38fd9c Provisioning: don't re-run Conan 5 times if there is no error 
Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-07-26 07:50:35 +03:00
Qt Submodule Update Bot
dd7a80d757 Update submodules on '5.12' in qt5 
Change-Id: Ife94a7c6264fbb4525ba2cd0370bdf1ba454b7c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-25 10:15:39 +02:00
Qt Submodule Update Bot
2237ea6d0c Update submodules on '5.12' in qt5 
Change-Id: I09887cc4b1e103b9341f096c4c9164f4a96bd431
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-23 09:59:39 +02:00
Qt Submodule Update Bot
cfe2c097e9 Update submodules on '5.12' in qt5 
Change-Id: Ib0b559d638d7ae6df4129b97f433b168af757443
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-14 23:30:51 +02:00
Qt Submodule Update Bot
e8c8c94278 Update submodules on '5.12' in qt5 
Change-Id: Ieb1b3ec8ae527fe13bd1980045f721511ef579a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-07 23:30:56 +02:00
Qt Submodule Update Bot
b769633c2e Update submodules on '5.12' in qt5 
Change-Id: I4c21b50f87410c4c253f510604e3ec80d6b6f929
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-06 17:46:42 +02:00
Qt Submodule Update Bot
bf78588505 Update submodules on '5.12' in qt5 
Change-Id: Ief716d10e9e1efcb655f96cc297a3a22ff67839b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-05 09:45:54 +02:00
Qt Submodule Update Bot
e41646897c Update submodules on '5.12' in qt5 
Change-Id: I039e035c56bd14a86eb1b309d0372c90b5d737cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-04 06:04:31 +02:00
Toni Saario
107fb06016 Fix extra file and missing library in platform configurations 
Missing libraries in no-gui platform.
Default.txt was supposed to be removed by
    439a1eb220

Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-07-02 06:47:59 +00:00
Toni Saario
439a1eb220 Change configuration files into yaml format 
Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-07-01 10:28:29 +02:00
Qt Submodule Update Bot
e2fa816df4 Update submodules on '5.12' in qt5 
Change-Id: I1bdf6510557ffbc7b3bfd292d18a0f27cb0cee23
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-28 16:21:45 +02:00
Tony Sarajärvi
8c4ac28b0d Add correct openSSL arguments to no-gui builds 
Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-06-28 11:43:45 +03:00
Heikki Halmet
91ab567a64 Provisioning: Upgrade PyYAML because of possible security vulnerability 
Known high severity security vulnerability in pyyaml v< 4.2b1

Task-number: QTQAINFRA-2888
Change-Id: I6522fc66ca7c4323cc6248ec2cb31c62201f8e84
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-18 14:35:52 +03:00
Tony Sarajärvi
d494d76c26 Add a no-opengl build on Ubuntu 18.04 
Task-number: QTQAINFRA-2577
Change-Id: I815adf0f85f688d9d584b95122d1944cb4b660c1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-06-26 10:14:17 +03:00
Tony Sarajärvi
670aa09aba Provisioning: Fix cleanup when building GCC from sources 
We need sudo rights to delete the temporary folder
where sources for GCC are extracted.

Change-Id: Ic0642e44eabfc3449f7ce5903a63bd38924f7dca
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-16 13:45:06 +03:00
Qt Submodule Update Bot
2fd2a20f18 Update submodules on '5.12' in qt5 
Change-Id: I5476ca1d214e18ba91b313f9a742d31fc9e04fe7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-26 09:24:40 +02:00
Qt Submodule Update Bot
c06ab02f33 Update submodules on '5.12' in qt5 
Change-Id: I961e20f994ffcbc97b822f53069cc3bd5a399345
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-25 10:30:36 +02:00
Oliver Wolff
0c339c29d6 platform_configs: Add missing "Configure arguments" to qtconnectivity.txt 
Without the tag configure arguments will not be parsed by Coin so that
wrong configurations will be used.

Change-Id: I02f84cde07e9e4cf878add89ba9ba43dacf9d567
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-25 10:29:17 +02:00
Liang Qi
dc4790e751 Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12" 2019-06-25 10:29:08 +02:00
Liang Qi
34a13ff5d9 Merge remote-tracking branch 'origin/5.12.4' into 5.12 
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
 2019-06-25 10:29:08 +02:00
Qt Submodule Update Bot
4048c76e65 Update submodules on '5.12' in qt5 
Change-Id: Idb8c2824d7d6d7359b0845fcb200d1331029cec9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-21 10:16:38 +02:00
Qt Submodule Update Bot
6361946518 Update submodules on '5.12' in qt5 
Change-Id: I3b189f1cfbf6898e35b91eb821485f3b9eeb678b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-19 10:31:09 +02:00
Qt Submodule Update Bot
bb8b7c5140 Update submodules on '5.12' in qt5 
Change-Id: I673d342cd906782d8444eebcb8e16ad6cec827f0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-18 13:23:09 +02:00
Liang Qi
452e0d94d4 Update submodules on '5.12' in qt5 
Ignore qtvirtualkeyboard temporarily.

Task-number: QTBUG-76371
Change-Id: I6d62f0f60b30044baaef092cbd8066bbca8d0df7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-18 10:36:33 +02:00
Antti Kokko
6e350aff34 ogl-runtime: instead of linking to qt5.txt use the actual configuration 
Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.4 		2019-06-12 15:15:32 +03:00
Qt Submodule Update Bot
e926f95049 Update submodules on '5.12.4' in qt5 
Change-Id: I2b8b3fc60e242872f1cfb850c6219a72b39d471a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-13 03:10:05 +00:00
Heikki Halmet
d87d4e0219 Disable MySQL from packaging builds 
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a05bd71ede)

Change-Id: I97d1d06b266490080325126e2dd715436a91b01a
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2019-06-13 05:52:55 +00:00
Heikki Halmet
de41591477 Fix openssl 1.1 library configurations 
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2019-06-13 08:29:02 +03:00
Qt Submodule Update Bot
0e454d2a14 Update submodules on '5.12.4' in qt5 
Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-11 04:05:34 +00:00
Jani Heikkinen
01c38dfad8 Use link to qt5.txt instead of copy in qt3d-runtime.txt 
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 
(cherry picked from commit c5e443374a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-09 17:18:19 +03:00
Antti Kokko
1db94fc9ef Add platform configuration file for ogl-runtime repository 
Use configuration from qt5.txt.

Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-10 11:49:11 +03:00
Qt Submodule Update Bot
fb534d1b44 Update submodules on '5.12.4' in qt5 
Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-10 10:19:00 +03:00
Heikki Halmet
acff1703e4 Install prebuilded OpenSSL 1.1.1b for Windows 7 
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 247b429c3c)
 2019-06-10 10:19:00 +03:00