diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:41 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:41 +0100 |
| commit | 4bfe4b892cbbe1f1936d7caa0aac603258abc5df (patch) | |
| tree | 978bf8668c1ed3be7954478f548872e4913c8f6f | |
| parent | 35e83521b6a4c9efd50d498b23892b81ebbf20e7 (diff) | |
| parent | c901f6d2ee7f73f58881424b05d57360720fa7d9 (diff) | |
| download | qtquickcontrols-4bfe4b892cbbe1f1936d7caa0aac603258abc5df.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I8c72cfdfde1bef36bee9acdbc41652485a9f261e
0 files changed, 0 insertions, 0 deletions