Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Provisioning: Remove shell scripts under windows | Heikki Halmet | 2019-11-20 | 1 | -39/+0 |
| | | | | | Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> | ||||
* | Merge remote-tracking branch 'origin/5.12' into 5.13 | Liang Qi | 2019-08-03 | 1 | -0/+39 |
Conflicts: .gitmodules ignore QtWebEngine on QEMU temporarily. coin/platform_configs/default.yaml no-gui build was removed temporarily. coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/qtsaferenderer.yaml Task-number: QTQAINFRA-2576 Task-number: QTBUG-77304 Task-number: QTBUG-77305 Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: If7cf75791677eace762374b92382a2ce15f17f55 |