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
..
2019-04-13 11:38:39 +02:00
2019-04-13 11:38:39 +02:00
2018-11-20 19:37:06 +01:00
2019-04-01 15:16:59 +00:00
2019-04-13 11:38:39 +02:00
2019-04-01 15:16:59 +00:00
2019-04-13 11:38:39 +02:00
2019-03-17 08:16:25 +00:00
2019-03-17 08:16:25 +00:00
2019-03-17 08:16:25 +00:00
2019-03-17 08:16:25 +00:00
2019-04-13 11:38:39 +02:00
2019-04-13 11:38:39 +02:00