Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtwebkit.yaml coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c | ||||
* | CMake: Enable CMake builds for qtquick3d | Alexandru Croitor | 2020-04-27 | 1 | -0/+38 |
Change-Id: I9547c73e8a632754d043bff8c72c29c18449bfd9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> |