diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:08:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 12:07:09 +0200 |
| commit | 76a5e8903e56de6746bdd3c6d5627817b114ea09 (patch) | |
| tree | c84ab19e53ac3853372c4e8106b4e6c5651a7ddb /tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp | |
| parent | 962371cbe3f01f3c30991522de1d03c8dfd77164 (diff) | |
| parent | be84c8103b830c4c4bbda7ccfc72aea5b10e779b (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I2f2a9371dd1085c10450f23e56c9f18078cc8698
Diffstat (limited to 'tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp')
0 files changed, 0 insertions, 0 deletions