diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:55 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:55 +0100 |
| commit | 451a120ad9dc1ec23e11720691dd3797cd683848 (patch) | |
| tree | 8950b2da450c19989c42f7c78c83b74b3a869d1e | |
| parent | b32525aee5964e1833f5add47ee6a18ca5a90112 (diff) | |
| parent | c47161c6c4c4b1d3252faf7f3088b526ba783513 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I223487517c7e2939b99b1d353131685ee0552d15
0 files changed, 0 insertions, 0 deletions