diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:00:46 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:09:19 +0200 |
| commit | 07296992462dccf7e4512a829e9e1e5374f42764 (patch) | |
| tree | 37e8ce4f8bdc5d4fc43951241c8882bbdd303850 | |
| parent | ed168b2897a3a6ec65a2eb93079a56bf8bb77942 (diff) | |
| parent | 4f5b04a5f6376b3b29e37abb6301cc1bdab5af83 (diff) | |
| download | qtquickcontrols-07296992462dccf7e4512a829e9e1e5374f42764.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: Id5ab00e39bb4a00fa9c17a02cf3db8c6b73a5650
0 files changed, 0 insertions, 0 deletions