diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-10 10:19:28 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-10 10:19:28 +0100 |
commit | d1f4409a2b1e0143be0d4fd734f3dd83255ea35c (patch) | |
tree | 52daa990c1da2c2ce9656fe4065b73a848a57a5a /src/core/location_provider_qt.h | |
parent | 8e5ac243ac774209b77bec42eda2ec43f9c9b04a (diff) | |
parent | 776442f2117c4b2d6dac75ab56b42bd82e2ce6d0 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
tests/auto/widgets/widgets.pro
Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
Diffstat (limited to 'src/core/location_provider_qt.h')
0 files changed, 0 insertions, 0 deletions