diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:06:31 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:06:31 +0100 |
commit | 3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837 (patch) | |
tree | 4ed42945aab2893008a465b89f5f6445e6ac46a4 /.qmake.conf | |
parent | 53ce60e9f9bf8a6c6b6f1c293564998b431987be (diff) | |
parent | c9e6509d3b1191831e6f4c4cd41aa283f6dfe583 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2
Change-Id: Iab2eee7fbd86759c6f9512b79c65ca5dc773b748
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions