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,216 Commits 118 Branches 270 Tags
daf8327b2c71982a8f9599e9c41cff6577f1e9be
Commit Graph

3216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
daf8327b2c Update submodules on '5.13' in qt5 
Change-Id: I40b83973a9cab06f068c8a61f51fded3eddebeef
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-25 20:16:42 +02:00
Konstantin Tokarev
3a940903c0 Make header line in qtwebkit.txt longer to prevent parsing error 
Change-Id: I0531f91af397d09cfa7eae96c0d779d3055b0456
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-25 10:47:00 +03:00
Qt Submodule Update Bot
1ba5e3b0b9 Update submodules on '5.13' in qt5 
Change-Id: I6f19903a3a7cdcf8fb2579b710ccda23427fb91b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-24 22:30:58 +02:00
Konstantin Tokarev
35c1c88749 Update platform_configs for QtWebKit 
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I02f6649b77e89b9acb3bdd516419aa12817caaa3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-24 13:02:11 +03:00
Qt Submodule Update Bot
e7f8eeb30d Update submodules on '5.13' in qt5 
Change-Id: I567e22dba0fc0b4c3dd377aa3d37ba0985855ba1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-22 22:30:55 +02:00
Qt Submodule Update Bot
6131434bdf Update submodules on '5.13' in qt5 
Change-Id: I62f02ca85e035aa26dc0f9a0ebb4d78e4abc2363
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-20 22:31:38 +02:00
Qt Submodule Update Bot
dedbec30d1 Update submodules on '5.13' in qt5 
Change-Id: Ia2ae5b47bc7e4aa094c6ed72d0a7be3bef090387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-19 22:30:48 +02:00
Qt Submodule Update Bot
a04751c10e Update submodules on '5.13' in qt5 
Change-Id: I216600c90956b5716b1ce1a787b21417dbc4089a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-18 22:31:30 +02:00
Qt Submodule Update Bot
6f6b43593e Update submodules on '5.13' in qt5 
Change-Id: Ifb6609089d41976f649b73df26e9214ab3b49fd4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-17 22:32:31 +02:00
Qt Submodule Update Bot
dcb1c8b41c Update submodules on '5.13' in qt5 
Change-Id: Id806418087800e313ee9a14c0a99fcf7215579c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-14 22:31:34 +02:00
Qt Submodule Update Bot
305278ff93 Update submodules on '5.13' in qt5 
Change-Id: I4363311b5e75dd00eb5c869d013b701a2ef7ef49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-12 22:31:12 +02:00
Qt Submodule Update Bot
7b36e44d7a Update submodules on '5.13' in qt5 
Change-Id: Ic3abd12e65592ae218e47b96bf5e80ccf92807e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-11 22:31:13 +02:00
Qt Submodule Update Bot
0d7a64fd8c Update submodules on '5.13' in qt5 
Change-Id: I8a94229ad71e5ee71e77bbe27641239f6a6940dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-10 22:30:57 +02:00
Qt Submodule Update Bot
bb18b48251 Update submodules on '5.13' in qt5 
Change-Id: I07ecded02a10f0d0849de89e36569e88c2d0cf8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-09 22:30:57 +02:00
Qt Submodule Update Bot
f4bbadba41 Update submodules on '5.13' in qt5 
Change-Id: I4dae0c7ec72588d61f479074307bbe9515aeb895
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-08 22:31:05 +02:00
Qt Submodule Update Bot
14adbe74dd Update submodules on '5.13' in qt5 
Change-Id: Id5b714f25384e8b6db9d314d63344440fa459b17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-07 22:31:13 +02:00
Qt Submodule Update Bot
5bba104a41 Update submodules on '5.13' in qt5 
Change-Id: I7bb7197fced3470b41e8d2b77f0af4617607ce97
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-06 22:31:14 +02:00
Qt Submodule Update Bot
220097d10c Update submodules on '5.13' in qt5 
Change-Id: Iad275ca3305f834c0ff484df8c6469931fbcb3d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-05 22:31:55 +02:00
Heikki Halmet
5db0ce74b7 Provisioning: Update QNX 7.0 packages 
Updated packages includes QNX Multimedia Suite 2.0,
which enables building QtMultimedia QNX plugins

Task-number: QTBUG-71073
Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2019-04-24 13:27:06 +03:00
Qt Submodule Update Bot
a4e4c13f01 Update submodules on '5.13' in qt5 
Change-Id: I43c1b4dac692f6c93702d05d3ee2a2ec224b2736
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-28 21:59:04 +02:00
Liang Qi
9d3f29dc03 Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-05-27 15:18:06 +02:00
Liang Qi
7ef9985e4e Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: I56973a90b028a77c3692f790648b605622af4af6
 2019-05-27 15:18:06 +02: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
Qt Submodule Update Bot
a0291fde84 Update submodules on '5.13' in qt5 
Change-Id: I5b52a5c17a612ba62948c01696e71c88bd84e85c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-05-24 16:22:05 +02: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
Qt Submodule Update Bot
3e6f5b1486 Update submodules on '5.13' in qt5 
Change-Id: Icc5ec39c45931aec77ca5287c14d08902ec6c551
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-21 13:48:00 +02: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
Allan Sandfeld Jensen
04fa1bf4ef Fix qtdeclarative boot2qt CI config 
DISTRO_OPTS was missing quotes.

Change-Id: Iffcfce8e34f95b5a0c0f0309b26291b31b12a7dc
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-05-13 18:20:59 +00: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
0a1e27b33e Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: Ibab4a9d55ce371259f52edb1819a397c1f2d7d9e
 2019-05-09 12:04:02 +02: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
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
Qt Submodule Update Bot
ea052ceb0a Update submodules on '5.13' in qt5 
Change-Id: I4f9b2ff00e79cf16a9effd6bdffa679a7f25b50b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-02 09:04:01 +00:00
Qt Submodule Update Bot
d27f9e9b88 Update submodules on '5.12' in qt5 
Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-30 18:44:54 +00:00
Kari Oikarinen
b692cf823a Adjust submodule branches 
Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2
 2019-04-29 11:48:19 +03:00
Liang Qi
22bb88ed07 Update submodules on '5.12' in qt5 
Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-26 05:46:36 +00:00
Liang Qi
ffe0c11420 Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into refs/staging/5.12 2019-04-26 05:46:30 +00:00