lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-26 06:37:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,436 Commits 120 Branches 274 Tags
c4e14a59ecb1c47f4aa3d2fb726ec37384a7eb3b
Commit Graph

2 Commits

Author SHA1 Message Date
Liang Qi
8710c7d9cf Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
 2019-04-13 11:38:39 +02:00
Tony Sarajärvi
89e0159bbc Swap openSUSE 42.3 to 15 
Task-number: QTQAINFRA-2067
Change-Id: I71f79181704d6ce8faac0019f6d7a5016b0ecb5e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-01-10 17:39:51 +00:00