diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:24 +0100 |
| commit | 7edb958482ddf3670a6a366d186883478aab1441 (patch) | |
| tree | 9ac3ac27f8e0d6138dea35286335e7983a58f43c | |
| parent | 0f34414b2bb30f7ce3eaf1a3fb69146b15756449 (diff) | |
| parent | 35dc39d77ba8c8e6cc750b64ff53e69155dea97f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I84d5b2807fc90d51f81d2239ab1436010261c9bd
0 files changed, 0 insertions, 0 deletions