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-01 11:42:49 +00:00
2018-08-30 04:53:50 +00:00
2018-09-04 08:28:58 +00:00
2018-02-23 08:20:34 +00:00
2018-09-03 19:38:32 +00:00
2018-09-03 19:38:37 +00:00
2018-11-07 07:23:49 +00:00
2019-01-10 17:39:51 +00:00
2018-12-10 14:10:54 +00:00
2018-12-10 14:11:01 +00:00
2019-04-13 11:38:39 +02:00
2018-04-29 13:20:29 +00:00
2018-09-11 13:32:20 +00:00
2018-04-29 13:20:29 +00:00
2018-10-26 07:23:14 +00:00
2018-08-07 18:11:43 +00:00
2018-08-07 18:11:43 +00:00
2018-09-03 19:38:34 +00:00
2018-11-07 07:23:49 +00:00
2019-01-17 09:45:02 +00:00
2019-01-04 14:09:59 +00:00
2018-09-12 18:16:02 +00:00
2018-09-04 08:28:58 +00:00