lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-23 23:01:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,209 Commits 120 Branches 273 Tags
829cdbe4c8bea2dd80912d4bd0368982b4fcfb4e
Commit Graph

5209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michaël Celerier
086439b018 Upgrade CMake to 3.15.0-rc1 
Change-Id: I374631637a6521621dfa702aa2390998ef124d24
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-05 09:21:01 +00:00
Qt Submodule Update Bot
c15485df43 Update submodules on '5.13.0' in qt5 
Change-Id: Ie903e4f8177b324ec981a1d57e7c2e0b4f76d585
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-rc1 		2019-06-03 10:59:12 +00:00
Ryan Chu
84ff024609 Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)" 
This reverts commit 577d01e9df.

Reason for revert: force vmx instructions to Coin level B virtual machine

Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-31 07:30:23 +00:00
Qt Submodule Update Bot
02404b0cec Update submodules on '5.13.0' in qt5 
Change-Id: Idc487281a4293ad8cc5ad494b79fd941efc820ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-31 04:08:58 +00:00
Liang Qi
dae67b28ab Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-28 22:15:01 +02:00
Qt Submodule Update Bot
f22f1007f4 Update submodules on '5.13.0' in qt5 
Change-Id: I1d1d7dd6d259b26f0c0216efd1976ac79b500e78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-27 06:08:44 +00:00
Liang Qi
5d3976765c Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-26 20:49:48 +02:00
Heikki Halmet
247b429c3c Install prebuilded OpenSSL 1.1.1b for Windows 7 
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-26 08:14:11 +03:00
Heikki Halmet
ebcfcbe69a Add Android x86_64 architecture 
Task-number: QTBUG-47672
Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-beta4 		2019-05-25 08:47:52 +03:00
Liang Qi
aabcc8128c Provisioning: Add ninja to the list of installed packages 
Change-Id: I018e7812fc95c1db841720294a700a391246251d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-24 09:58:03 +00:00
Jędrzej Nowacki
79bc4f0771 Move some configure arguments to qtbase instructions 
These arguments are specific to the build and changes to them are _not_
affecting configuration.

Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-22 15:35:44 +00:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b 
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-22 15:34:04 +03:00
Qt Submodule Update Bot
b7c0e2db78 Update submodules on '5.13.0' in qt5 
Change-Id: I51a93793234d86494580ec6a9d53b7cd414c888b
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
 2019-05-23 04:17:14 +00:00
Liang Qi
47225925c5 Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-22 14:01:42 +02:00
Liang Qi
20e8121c77 Use yaml configuration file for cmake support 
It is needed by new coin to support cmake build as only
there configuration arguments are separated from features.

Change-Id: I960ec693f80803fd86de472efc953a38358ae14e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2019-05-20 12:37:44 +00:00
Allan Sandfeld Jensen
edc39be08b Fix qtdeclarative boot2qt CI config 
DISTRO_OPTS was missing quotes.

The same thing is also done in 3e6a04c09d.

Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit 04fa1bf4ef)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-16 10:42:41 +00:00
Frederik Gladhorn
5677a43a25 Remove platforms from Qt 6 
Get to a smaller set to reduce load on the CI and have faster
turnaround times while developing. Remove some older compilers
that do not support the minimum C++ feature set we want to require
for Qt 6.

We'll need to revisit and probably expand this set when we get closer
to releasing Qt 6.

Change-Id: I6afba8b3caca0fac5bbf80efdcde7714b8d1ab76
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-05-16 08:33:58 +00:00
Juha Karjalainen
230a73409a Provision sed for windows 10 
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-16 04:14:35 +00:00
Ulf Hermann
3e6a04c09d qtdeclarative platform config: Add missing quotes 
Change-Id: Ib8c0a2aad21718dba25728d3ac869c23f314554a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-16 04:14:30 +00:00
Qt Submodule Update Bot
991500dc85 Update submodules on '5.13.0' in qt5 
Change-Id: Ibb7ad97a0fb6cbc2d7d8d77d0fd115c1d602ee07
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-16 04:14:23 +00:00
Liang Qi
2e028e620d Bring qt3d back 
Task-number: QTBUG-75384
Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-13 14:20:06 +00:00
Qt Submodule Update Bot
e6c0dc1d60 Update submodules on 'dev' in qt5 
Change-Id: I370770bdc8179075f4e5e01e54a29591fd7caa16
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-13 05:30:49 +00:00
Liang Qi
faf54c4cec Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I3eb42ce8a43418919c9bb8d0ac4d3714aea94fac
 2019-05-12 20:36:18 +02:00
Qt Submodule Update Bot
7d1d1aa2d2 Update submodules on '5.13' in qt5 
Change-Id: I0e6e46b247198ce68668222e555e3ebf256729bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-12 15:51:20 +00:00
Liang Qi
6fbaba5d52 Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: Ib80ac156ec8ce5690d5ec784c671bd706afe0b4e
 2019-05-12 11:12:36 +02:00
Aapo Keskimolo
9c49284978 Remove redundant windows configuration 
The windows configuration was added by commit

 8cdf60fe64

which was unintended and caused breakages due to wrong library paths.

Regression was introduced by 65d4cea3ac12a5d585da7ee1ba2933a3c23051b8 which
allowed sharing storage paths with builds with different configure arguments.

Change-Id: I18d12c4ff86a5bb28484c7b39ca38ff4f6f590d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-12 07:29:17 +00:00
Qt Submodule Update Bot
494d10fb73 Update submodules on '5.13' in qt5 
Change-Id: Ieb925882ea0c8b536bde7f9a1d63aecdf6213632
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-09 20:44:40 +00:00
Liang Qi
192372bb56 Update submodules on 'dev' in qt5 
Change-Id: I085f25a148ddc404f399e79924968acfd6b7de07
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-09 19:50:49 +00:00
Liang Qi
f557e0634f Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
 2019-05-09 15:27:08 +02:00
Liang Qi
a66a54035c Update submodules on 'dev' in qt5 
Temporarily ignore qt3d until it got fixed correctly.

Task-number: QTBUG-75384
Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-09 12:57:41 +00:00
Liang Qi
0a1e27b33e Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: Ibab4a9d55ce371259f52edb1819a397c1f2d7d9e
 2019-05-09 12:04:02 +02:00
Liang Qi
073dfc6457 Update submodules on 'wip/cmake' in qt5 
Change-Id: I437150950324ad3734ad895b6cbc4ad7bf6139a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-08 14:19:22 +00:00
Tony Sarajärvi
8cdf60fe64 Split features list between Coin and qt 
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-08 09:18:56 +00:00
Qt Submodule Update Bot
819362c5d6 Update submodules on '5.13.0' in qt5 
Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-08 06:47:41 +00:00
Liang Qi
8f63da629a Merge remote-tracking branch 'origin/5.13' into 5.13.0 
Change-Id: If2321aae395ea99c0fb4cf4ef7b3c5a580d3357e
 2019-05-07 14:58:36 +02:00
Tony Sarajärvi
049eb21a1d Replace RHEL 7.4 with 7.6 in the CI 
Task-number: QTQAINFRA-2942
Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-07 07:15:58 +00:00
Qt Submodule Update Bot
c6b018a925 Update submodules on '5.13' in qt5 
Change-Id: Ib948b49eccead6649f228a3d7acc83a2f6522660
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-06 06:56:28 +00:00
Liang Qi
aeea2c8425 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Ia93633ae4ef9677ede751467a70e8f91799829a2
 2019-05-04 11:04:32 +02:00
Qt Submodule Update Bot
4c4595b93b Update submodules on '5.13.0' in qt5 
Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-03 09:15:06 +00:00
Liang Qi
21604cf7da Provisioning: install vcpkg and some packages on Windows 10 
Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:37:10 +00:00
Liang Qi
4c655a140b Provisioning: install latest cmake - 3.14.1 on Windows 
Change-Id: I461589be02c26e048d5975d59600376022d728fd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:37:05 +00:00
Liang Qi
ad2f91e414 Provisioning: Add Windows 10+MSVC2017 to test cmake build 
Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:37:02 +00:00
Liang Qi
cb860d794d Provisioning: Add freetype to the list of installed packages on macOS 
Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:57 +00:00
Liang Qi
705696e1d1 Provisioning: Add pcre2 to the list of installed packages 
This external dependency is now required by QtCore on macOS.

Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:45 +00:00
Liang Qi
8b0a10d1c1 Provisioning: build cmake from source on macOS 10.13 
Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:42 +00:00
Liang Qi
05eaaeda4b Add macOS 10.13 to test cmake build 
Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:38 +00:00
Liang Qi
e57569e70c Update submodules on 'wip/cmake' in qt5 
Only needed for qtbase though.

Change-Id: Ib3fdd44c2804139795fc1efc192e05d227f8b8dc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-05-03 08:36:27 +00:00
Liang Qi
ff8220f9f6 Merge remote-tracking branch 'origin/dev' into wip/cmake 
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtbase.txt

Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
 2019-05-03 10:10:23 +02:00
Qt Submodule Update Bot
c2506b0f9c Update submodules on '5.13' in qt5 
Change-Id: I99a2129b1f73fc1dd801b406b9741cdfea37429e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-03 07:32:05 +00:00
Juha Karjalainen
6465c42122 Provisioning: install msys2 
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-03 07:30:44 +00:00