diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:01:25 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:01:26 +0200 |
commit | a2b9b53b8ec20199a440d574bac0ba7fb1c1042f (patch) | |
tree | dba7c0e1ceaf1d1865be2e4e8b6f661dd3aa5e3f /.qmake.conf | |
parent | aa31ad15010aae654c61d624fa6161a2e64faa54 (diff) | |
parent | 0c40c9dae7c944bbf48c00c32a046a879fa0e7ac (diff) | |
download | qtquickcontrols-a2b9b53b8ec20199a440d574bac0ba7fb1c1042f.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I4194dd92ef851407e667bd1c635367a1bae97480
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions