diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:06 +0100 |
| commit | a7829e1ea20d3734bd78fd2300459aabd7470771 (patch) | |
| tree | 6704a13651c8588e04d69adcb498f048f236e01c /src | |
| parent | ce14a8a4b2b99f91a21e1dce508688d7cd3dbe0e (diff) | |
| parent | caecffab98cb2c47140579712e5b7bc7f7ce3070 (diff) | |
| download | qtquickcontrols-a7829e1ea20d3734bd78fd2300459aabd7470771.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I208e2e1d8da2123359be0581c83557e862465247
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions