diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-22 11:36:33 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-22 11:36:33 +0200 |
| commit | b4a065d70e86405bc658b54fffad7c69a12f27aa (patch) | |
| tree | 46f2efb8c67188e41aa2b72870a5b2415dbbbacc /tests/auto/declarative_ui/tst_map.qml | |
| parent | f983215417a8128010b156ab0371380563fa1a4a (diff) | |
| parent | 116b41eed67ca923ca205d2c7aa0776b0eaa1a4e (diff) | |
| download | qtlocation-b4a065d70e86405bc658b54fffad7c69a12f27aa.tar.gz | |
Merge remote-tracking branch 'gerrit/5.6' into dev
Conflicts:
tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
Change-Id: I1cd05c8e9c9e55edc0d2d1c2b967d94a9efd0394
Diffstat (limited to 'tests/auto/declarative_ui/tst_map.qml')
0 files changed, 0 insertions, 0 deletions