lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 03:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,464 Commits 120 Branches 274 Tags
39a42f0abd1cffc634fe5ba91dde893bebc43021
Commit Graph

2 Commits

Author SHA1 Message Date
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
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