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
..
2018-07-23 20:19:30 +00:00
2018-08-24 18:24:50 +00:00
2018-03-18 16:22:07 +00:00
2018-11-13 05:51:53 +00:00
2018-01-10 07:58:26 +00:00
2019-03-22 12:06:56 +00:00
2018-09-04 08:29:08 +00:00
2018-09-04 08:28:58 +00:00
2018-04-29 13:20:32 +00:00
2018-04-29 13:20:32 +00:00
2018-03-19 11:57:09 +00:00
2019-01-10 12:32:57 +00:00
2018-04-15 05:55:35 +00:00
2019-04-11 06:10:22 +00:00
2018-07-31 14:36:41 +00:00
2018-04-29 13:20:32 +00:00
2018-01-10 07:58:26 +00:00
2018-01-10 07:58:26 +00:00