diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:15:44 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:15:45 +0200 |
commit | 5f30c77484a9af223d32067f579d440010520eb2 (patch) | |
tree | 4550e7fa64163a0d20de372f5b477da2dc1276b6 /.qmake.conf | |
parent | 771867113c7d531f576768652a40c5cf53d9e57f (diff) | |
parent | 8b70dcb210d82a55220c0a953653646a91d55251 (diff) | |
download | qtconnectivity-5f30c77484a9af223d32067f579d440010520eb2.tar.gz |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I7ea913083777358265f62b4bf6beed3f2db0ebe1
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions