diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:12:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:12:49 +0100 |
| commit | 912f7c727a4362c9530804d9bf1fd92062734af1 (patch) | |
| tree | 2b8f133217b6a2b79cb2359f43db2cac3dcbd4db /src/location/labs/qmappolylineobject.cpp | |
| parent | 7bc6e97a440bc938c042141a6b6890831ee176df (diff) | |
| parent | 5ec322a7572fca8cfb3b9d4cb30bcff5fbe6eed1 (diff) | |
| download | qtlocation-912f7c727a4362c9530804d9bf1fd92062734af1.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Iccbd3c3f2162973d407a31b02ea6911f3c1d5b31
Diffstat (limited to 'src/location/labs/qmappolylineobject.cpp')
0 files changed, 0 insertions, 0 deletions