lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 17:56:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,803 Commits 120 Branches 272 Tags
69342bb5b7b85a5bee2a8e1bdb7cf3ce80bc5e5c
Commit Graph

3803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Qt Submodule Update Bot
54e8d38972 Update submodules on '5.12.5' in qt5 
Change-Id: If4b169a8c53ffb6857cc43d6e1dd5f7d639db45f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-26 07:47:12 +02:00
Qt Submodule Update Bot
98d9e2ebaa Update submodules on '5.12' in qt5 
Change-Id: I0fafe70aa1dcb74cd6e06eb37dca1175a50c568e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-24 08:32:33 +02:00
Qt Submodule Update Bot
5f8a9b15de Update submodules on 'dev' in qt5 
Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-23 06:55:03 +02:00
Tony Sarajärvi
0414df3e2e Build MIPS64 with b2qt toolchain - again 
This configuration verifies big endian builds.

The build was accidentally removed in merge
a94696ccd5.

See also 9b84c7135b.

Task-number: QTQAINFRA-2492
Change-Id: I2616f918591758b4cfee244a0a5414a61322f7d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2019-08-22 11:30:56 +00:00
Liang Qi
c9a0797a11 Update qtdatavis3d only 
Change-Id: Ic100c7bac6fd7155203e2c16a2f855423b52cc5e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-22 13:30:49 +02:00
Qt Submodule Update Bot
9b0ff12595 Update submodules on '5.13' in qt5 
Change-Id: I3c4c289580c3a5200989e76502c43a9ef293afed
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-22 09:02:00 +02:00
BogDan Vatra
9dd4451234 Android: Update Android NDK to version r20 
Fixes: QTQAINFRA-3152
Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
 2019-08-22 06:55:47 +02:00
Qt Submodule Update Bot
54be78024d Update submodules on '5.12' in qt5 
Change-Id: I82c4484938c958901bbc961b76a4012e0e925b9c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-22 04:42:50 +02:00
Assam Boudjelthia
8a5d86d888 Suppress QEMU syscall and ioctl debug messages 
Compile QEMU with "Unsupported syscall" and "Unsupported ioctl" messages
suppressed, those can be shown by set/unset environment variable QEMU_SYSCALL_DEBUG.

Task-number: QTQAINFRA-2808
Change-Id: If0b28c47f2599c4ebca9cae6a6d38f9a4fd00458
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-08-21 12:00:57 +03:00
Liang Qi
3631a12b84 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-21 08:31:18 +02:00
Liang Qi
04f8b0619d Merge remote-tracking branch 'origin/dev' into 5.14 
Change-Id: Iaccaf809372bc6132af4e25af2ca8b163b810e0a
 2019-08-21 08:26:49 +02:00
Qt Submodule Update Bot
e27c7adda7 Update submodules on '5.13.1' in qt5 
Change-Id: I6a801fd43a71d5ba772e71dae4101a6edbbcac95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-21 04:09:06 +00:00
Liang Qi
eb7370a7af Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-08-21 05:56:56 +02:00
Liang Qi
9a8fb868ec Merge remote-tracking branch 'origin/5.13' into dev 
This reverts commit d494d76c26.

 Conflicts:
        coin/platform_configs/default.yaml
                Temporarily remove the -no-opengl build.
        coin/platform_configs/meta-boot2qt.yaml
        coin/platform_configs/qt5.yaml
                Temporarily remove the webassembly build on windows.
        coin/platform_configs/qtwebkit.yaml

Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
 2019-08-20 14:10:00 +02:00
Qt Submodule Update Bot
6e601907b9 Update submodules on '5.12' in qt5 
Change-Id: Icd7419b3717c164db5f978610a2e821b683d8b22
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-20 07:09:40 +02:00
Qt Submodule Update Bot
acafe0ad49 Update submodules on '5.13.1' in qt5 
Change-Id: I0f321007da9f236c069703125d5529a54ad27c9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-19 14:04:16 +00:00
Paul Wicking
2e9314967c Adjust submodule branches 2019-08-19 15:11:54 +02:00
Heikki Halmet
61acd9e95d Provisioning: Update iOS signing tools 
new apple id is required with notarization

Task-number: QTBUG-77359
Change-Id: I2aafda37d40608296d598b1d9ade83a025bcac8d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
 2019-08-19 13:31:38 +03:00
Paul Wicking
7c691c4622 Adjust submodule branches 2019-08-19 09:43:00 +02:00
Qt Submodule Update Bot
b959cb5359 Update submodules on '5.13.1' in qt5 
Change-Id: I4f319b0afe7e7369eb7db168f66ec57ed867c267
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-18 23:00:57 +02:00
Qt Submodule Update Bot
9656531361 Update submodules on '5.12' in qt5 
Change-Id: I8de6a77d460db6497b76dac92be674fe9e790b7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-18 11:21:34 +02:00
Qt Submodule Update Bot
b03790e34d Update submodules on '5.13.1' in qt5 
Change-Id: I6c95fa658c52571ce1e0588eac1b9763f0bae549
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-16 23:01:16 +02:00
Tuomas Heimonen
9d69ef09e3 Add Packaging to Saferenderer static builds 
Task-number: QSR-432
Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
 2019-08-15 09:05:43 +03:00
Qt Submodule Update Bot
53c6c8a1ba Update submodules on '5.12' in qt5 
Change-Id: Id2425a28299ca3653bc7d217855c276493bbccfe
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-15 05:40:13 +02:00
Qt Submodule Update Bot
3277628d62 Update submodules on '5.13.1' in qt5 
Change-Id: Ic89472db863aedd92db57dbaaf2dd5fd10efa96f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-15 05:39:39 +02:00
Liang Qi
63181db03e Enable a no-gui build on Ubuntu 18.04 for 5.13 
Task-number: QTQAINFRA-2576
Change-Id: I4bc96802b5fe940408158734b01f7b9b01361235
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-14 22:57:35 +02:00
Qt Submodule Update Bot
42366fd740 Update submodules on '5.13' in qt5 
Change-Id: I082dbfe9cd927aa112760db67e4657868289c4e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-14 22:25:00 +02:00
Qt Submodule Update Bot
8d90ddd531 Update submodules on '5.13.1' in qt5 
Change-Id: I2324f8a205f5e7fcb4cfea9e7e845ef9f4f867e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-14 16:20:11 +02:00
Liang Qi
2fd2a9d268 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-14 07:02:19 +02:00
Tony Sarajärvi
8e32f46764 Add Suse Linux Enteprise Server 15 to the CI 
Task-number: QTQAINFRA-3123
Change-Id: I725c58c7d319945f7470118dec99b5360385da7b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-08-14 03:45:39 +00:00
Jani Heikkinen
4175af18f8 Add Android x86_64 architecture 
It seems those build targets were accidentally deleted when
yaml change was merged in. Targets were there in Qt 5.13.0 release
(before yaml change)

This amends a94696ccd5.

See also ebcfcbe69a.

Task-number: QTBUG-47672
Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
 2019-08-13 22:11:31 +00:00
Tony Sarajärvi
24f0367a60 Add Suse Linux Enteprise Server 12 to the CI 
Task-number: QTQAINFRA-2851
Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-08-13 11:03:52 +00:00
Liang Qi
82e0fe1664 Merge remote-tracking branch 'origin/5.13.1' into 5.13 
Change-Id: Ifc39acfc1a0ba6019091a194088e99e451f99bde
 2019-08-13 10:49:03 +02:00
Qt Submodule Update Bot
b96719cb80 Update submodules on '5.12' in qt5 
Change-Id: I465bd3b417d3412d7d8d62d868aa8ccb338127f2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-13 07:45:27 +02:00
Qt Submodule Update Bot
c63dd0ddfd Update submodules on 'dev' in qt5 
Change-Id: I912e43550293e17b22e1401d50e7a4a06ee4c3b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-12 23:02:33 +02:00
Simo Fält
d19f60d745 Provisioning: Append the emscripten to path instead of prepend 
Having it first in path seems to cause some confusion when detecting
libc++ in darwin.

Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-08-12 21:01:55 +00:00
Qt Submodule Update Bot
19cc6b2b80 Update submodules on '5.13.1' in qt5 
Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-12 21:25:08 +02:00
Qt Submodule Update Bot
edf6149a5b Update submodules on '5.13' in qt5 
Change-Id: Id153f5c742637fe66bb9010fa41cb62645fb4e4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-11 12:04:31 +02:00