lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-21 05:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,700 Commits 120 Branches 272 Tags
fe87f13d439feebc47f5b643c8da95f5a00fc69e
Commit Graph

5700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
bd4774f690 Update submodules on 'wip/cmake' in qt5 
Change-Id: I72c047067aee2006aedfb97fa8d7e3fc214ee590
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 05:14:59 +00:00
Simon Hausmann
8b7c454d35 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I9ab957cbe9f81f266ec590e9fb8100608f77f55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-09-06 14:53:22 +00:00
Simon Hausmann
016016b64e Really add qttools to the build 
... and not qtscript accidentally, like in the previous change.

Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-06 13:32:03 +00:00
Simon Hausmann
01b083ca8e Disable qtscript for the cmake build 
The module has not been ported.

Change-Id: I99041e00fb30b2a9799ee3e948f255422bbc6976
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-06 09:23:52 +00:00
Liang Qi
f0a89a32da Update submodules on '5.14' in qt5 
Change-Id: Ice4211fcc08fa25a55d6a5be1b236b3bdc12c9e1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-06 11:06:00 +02:00
Simon Hausmann
f99d5e8b78 Re-enable qttools for use with cmake 
Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-06 09:04:50 +00:00
Assam Boudjelthia
0d273deeef Provisioning: Fix version of libiodbc on MacOs 
libiodbc latest version (3.52.13) was automatically installed causing
qt-config-gui to fail build, this installs version 3.52.12.

Task-number: QTQAINFRA-3188
Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-06 06:05:40 +00:00
Tuomas Heimonen
be97b9ad72 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build 
Add build flag '-no-xcb' to remove xcb from static build

Task-number: QSR-517
Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2019-09-06 07:11:51 +03:00
Tor Arne Vestbø
14c31bf8db Remove un-needed configure arguments for Apple OSes 
Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
 2019-09-05 23:40:29 +02:00
Simon Hausmann
e4259942ff Add empty build instructions to allow for qt5 integrations 
The build shall be empty for now, but this allow testing module wide
updates.

Change-Id: I47bcdae274edb2ec000bb57480d74614d3b55833
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-05 14:34:12 +00:00
Simon Hausmann
2b42c7d383 Update qtbase manually to pull in build fix for qttools 
Change-Id: I223b8c2f10bc05a5eacd103b65a061365e58ab46
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-05 13:38:20 +00:00
Qt Submodule Update Bot
a30c79bcfb Update submodules on 'wip/cmake' in qt5 
Change-Id: I90667c3b7b1920d129cc8821059a56a9d9f70766
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-05 11:58:23 +00:00
Liang Qi
5bd6aa7c26 Include qtimageformats and qtnetworkauth in wip/cmake 
Change-Id: I9f451ef08663a635ca05427735a31da895a68607
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-05 11:56:43 +00:00
Liang Qi
30d78feb0c Include qtgraphicaleffects in wip/cmake 
Change-Id: Ie8fd5d478caa1d16cdea3c06a9b7cfeeb7dcd0cc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-05 07:45:36 +00:00
Qt Submodule Update Bot
1c5e02896c Update submodules on '5.12.5' in qt5 
Change-Id: Ife588e41d563bf4246ed7eff14186aa7583b3397
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.5 		2019-09-04 19:29:15 +00:00
Liang Qi
651b050e13 Include qtdeclarative in wip/cmake 
Change-Id: I9d23a60fbd88e30ee688532dbe5112dd3245b9a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-09-04 17:52:10 +00:00
Simon Hausmann
bd8feeb6b2 Update qtbase manually 
Hopefully this pulls in the last fixes to make declarative work.

Change-Id: I7c4765be631b917ee51e200977a01a913bc619b2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-09-04 13:59:53 +00:00
Qt Submodule Update Bot
9eefc9213e Update submodules on 'wip/cmake' in qt5 
Change-Id: Id515390a8b8af0d989609d44fcc1e4d113190bca
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-04 13:19:25 +00:00
Heikki Halmet
30e7bf5745 Provisioning: Add Android NDK ROOT to environment variable 
Task-number: QTQAINFRA-3181
Task-number: QTBUG-74952
Change-Id: I4cc6936c3b3eef32a1013888ced3950cd1f39407
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
 2019-09-04 12:27:26 +03:00
Heikki Halmet
7fd2796b00 Provisioning: Update Android NDK version to macOS 10.14 
Currently we are provisioning older Android NDK version than the one
used in macOS 10.13. Let's keep these sync even though we don't currently
make Android builds with macOS 10.14

Change-Id: I6c284d50bac395eb474c0f7e34cd90eda3f180c3
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
 2019-09-04 12:27:09 +03:00
Liang Qi
700540f77a Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.14" 2019-09-04 09:42:18 +02:00
Liang Qi
f9801f90f6 Merge remote-tracking branch 'origin/5.13.1' into 5.14 
Conflicts:
	coin/platform_configs/qt5.yaml
		5.14 is using NDK r20 for android.

Change-Id: I483a628abd154c40937a44e196643a2be2552987
Fixes: QTBUG-77999
 2019-09-04 09:41:19 +02:00
Qt Submodule Update Bot
f3c4f6edeb Update submodules on '5.13' in qt5 
Change-Id: I653ae34a4544c7a9beb59cced2ce91d6512c67a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-04 06:56:17 +02:00
Qt Submodule Update Bot
c398a50e2d Update submodules on '5.12' in qt5 
Change-Id: I3467f8edbbd5c52f53ed786c2c0f185e8558c1f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-04 06:56:00 +02:00
Tuomas Heimonen
5035d38525 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build 
Add build flag '-qpa offscreen' to remove dependency to xcb libraries

Task-number: QSR-510
Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2019-09-03 21:37:50 +03:00
Qt Submodule Update Bot
885e662082 Update submodules on '5.13' in qt5 
Change-Id: I30e7dbbbc47d26fcd8d7f802b7f46b635c14a858
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-03 18:07:22 +02:00
Qt Submodule Update Bot
4259affdb7 Update submodules on 'wip/cmake' in qt5 
Change-Id: Ibf9eb43c66e2bb4d3c8e17d2ff99794408df9b9e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-03 11:51:34 +00:00
Qt Submodule Update Bot
34dd42b9f8 Update submodules on 'wip/cmake' in qt5 
Change-Id: I989dc05dc59095f47defb8cf4af20b40060ac2ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-03 09:27:51 +00:00
Qt Submodule Update Bot
ae3f765798 Update submodules on '5.12.5' in qt5 
Change-Id: I22bbce6e60cc835a5dc9f88737e04ecc7a1fc3e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-03 06:44:29 +02:00
Jukka Jokiniva
80791b03ee Update qtbase submodule on 5.13.1 in qt5 
Change-Id: Ia5d9429b6cfc0804355a2161a18f030db6fa6dae
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
v5.13.1 		2019-09-02 19:48:24 +03:00
Qt Submodule Update Bot
580d5fcc32 Update submodules on 'wip/cmake' in qt5 
Change-Id: Id663bfb78313de014c8412396321253a505f80c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-02 13:24:15 +00:00
Qt Submodule Update Bot
9ba0de3708 Update submodules on 'wip/cmake' in qt5 
Change-Id: Iee3299d179b8dfcdc7b69dd683c4be685610605a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-31 06:10:32 +00:00
Qt Submodule Update Bot
4c65509d24 Update submodules on '5.12' in qt5 
Change-Id: I1c5b9f51ed5a4dcb4469aa90439da993bc133319
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-30 22:02:37 +02:00
Qt Submodule Update Bot
27bbc46848 Update submodules on '5.13' in qt5 
Change-Id: I5c1cc1e7edced0c2b62643b40769d84ebdeb3611
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-30 14:17:51 +02:00
Liang Qi
4bf048f7a7 Include qtsvg in wip/cmake 
Change-Id: I6df7b31637e9512dc7fe92819741d01af3f87310
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-08-30 10:40:25 +00:00
Tuomas Heimonen
5752c0d4bc Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build 
Add build flag '-no-icu' to remove dependency to icu libraries

Task-number: QSR-499
Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2019-08-30 13:34:06 +03:00
Qt Submodule Update Bot
91e7e78e63 Update submodules on 'wip/cmake' in qt5 
Change-Id: I30bfbcd5e25391613bc5c7219446d0bc336894cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-30 08:41:25 +00:00
Qt Submodule Update Bot
314d3efaf0 Update submodules on '5.14' in qt5 
Change-Id: I0f5fdbd9f369dc42dd4c97dad1cb933753220e58
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-29 18:20:58 +02:00
Qt Submodule Update Bot
9828fd1d7b Update submodules on 'wip/cmake' in qt5 
Change-Id: If619405e5fb6aed8b4c2e9829514825e785d37b5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-29 05:53:46 +00:00
Liang Qi
136639b445 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-29 07:06:54 +02:00
Liang Qi
f58935ebea Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	coin/platform_configs/default.yaml
	coin/provisioning/common/linux/disable-ntp_linux.sh
	coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
	coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
		emsdk.sh was moved from linux to unix, see
		38e416be66

Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
 2019-08-28 20:28:11 +02:00
Qt Submodule Update Bot
097b013183 Update submodules on '5.13' in qt5 
Change-Id: Ibdf69fb6840da0ddcbe5e8623c19d0ce1c34f844
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-28 19:37:29 +02:00
Tuomas Heimonen
163bd8006e Update Saferenderer static builds 
qtci-windows-10-x86_64-10 static build: remove flag '-developer-build'
qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig'
and '-qt-freetype', remove flag '-developer-build'

Task-number: QSR-491
Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2019-08-28 09:53:18 +00:00
Qt Submodule Update Bot
90d59cb4c7 Update submodules on '5.12' in qt5 
Change-Id: I7f044a3d3a1aed8d1f9b97a1e73871ea91e9719e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-27 09:02:26 +02:00
Kari Oikarinen
97afb2ce08 Adjust submodule branches 
Change-Id: Id5eb73617e7c5783724910b58df6c991615a5caa
 2019-08-27 09:31:36 +03:00
Liang Qi
e6e51c07f5 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-27 00:39:02 +02:00
Gatis Paeglis
8f87412708 platform_configs: replace -qt-xcb with -xcb 
... as we are removing -qt-xcb switch from qtbase as part of
stopping to bundle xcb sources.

Change-Id: I33d58b78a1d7f53d5941ebda7131bf35a71cc8e6
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2019-08-26 23:07:06 +02:00
Tuomas Heimonen
11d6401d98 Update Saferenderer static builds 
DisableTests on qtci-windows-10-x86_64-10
Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64

Task-number: QSR-432
Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2019-08-26 20:47:05 +03:00
Liang Qi
6f3f8913d8 Merge remote-tracking branch 'origin/dev' into 5.14 
Conflicts:
	.gitmodules

Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
 2019-08-26 18:31:59 +02:00
Christian Strømme
ff75bd5297 Add QtQuick3D as a submodule in qt5.git 
Adds QtQuick3D as a preview module in dev

Task-number: QTBUG-77724
Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
 2019-08-26 12:43:06 +03:00