diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-23 01:00:08 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-25 10:13:23 +0100 |
| commit | a1e38651ce245edcd8628bc8e2aad7e83184066e (patch) | |
| tree | 27d3a68ac4204975faa6d0d427970fb1013e0ed4 /tests/benchmarks | |
| parent | 3980ccf785462dc7b2cb53f72790638eb9e7b8c0 (diff) | |
| parent | 42ed40cf0abd0155d6e6d1ef01faf9bded065588 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/qmltest/quicktest.cpp
tests/auto/qml/qmlcachegen/qmlcachegen.pro
Change-Id: I70e96e8817d59647f876b8b77b30cdeede8f0662
Diffstat (limited to 'tests/benchmarks')
0 files changed, 0 insertions, 0 deletions