diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:38:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:38:08 +0100 |
| commit | 4f28f1c27ae17146348ae3b262f8f0036dd70c62 (patch) | |
| tree | 0a08a13c7e6aeed42fa26f2825ddd317a1f2470d | |
| parent | d8f3fb7438bbbe0b807b124f26fe3204ce50c1ec (diff) | |
| parent | bd952e904070d8eb07748d620829e9dadb8022ba (diff) | |
| download | qtquickcontrols-4f28f1c27ae17146348ae3b262f8f0036dd70c62.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I01b56424aa71f6dcc9dd92fad206af08ac843de5
0 files changed, 0 insertions, 0 deletions