diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 03:00:30 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-17 09:45:48 +0000 |
| commit | d96bd6069c6d24c12f0a3d96466e50b4d1a09ac4 (patch) | |
| tree | b1250acd86c482fc92cd90d1733f0a436d1c2a78 /tests/auto/font/tst_font.cpp | |
| parent | 1567e4581e1f82dae011d6d3b2e4196efc93b0f4 (diff) | |
| parent | 449c9c2474da0461c14e7d6ea12ff4e35c3c7aae (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quickcontrols2/qquickstyle.cpp
src/quicktemplates2/qquickscrollview.cpp
tests/auto/qquickstyle/tst_qquickstyle.cpp
Change-Id: I9afddf07a956f43cf0445e91b8d1a02f167b6bd5
Diffstat (limited to 'tests/auto/font/tst_font.cpp')
0 files changed, 0 insertions, 0 deletions