mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
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