diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-10 10:16:41 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-10 10:17:09 +0200 |
| commit | 9877f822c2338f725cb00ab2531ca12b8d044765 (patch) | |
| tree | 0255e40f5366123bedefcbc9ad7d482f2e8198a2 /dist/changes-5.12.0 | |
| parent | 7268797ab9e32de7497f13ffa9820c49d8cb3e47 (diff) | |
| parent | 2f71cdff2cda7903fd0b5ff0033d790877e40181 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: Iee033b48b070f070c361c17a19eff5bf9e27f7b5
Diffstat (limited to 'dist/changes-5.12.0')
0 files changed, 0 insertions, 0 deletions