diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:27 +0100 |
| commit | d8ef5280d7d0773ac0b415994e6978e96fe228cc (patch) | |
| tree | 67ccce9b4c76cc208ebbe466e22455bffb54d178 | |
| parent | e50251958cabc8308bc20208241bd2cc00c97d9b (diff) | |
| parent | dbaa4a3678bb92095bbc187318bee32598f2ff3f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1c244a04eb78e16e46acf4a6beb87da26995b995
0 files changed, 0 insertions, 0 deletions