diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 10:53:45 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 10:53:56 +0100 |
| commit | 16423f84f970d7dac644a4b041e3ebe2ac0f6e22 (patch) | |
| tree | 40e88861e7987c5286012185303205113aa4ca3c /src/location/maps/maps.pri | |
| parent | 3f813d1c8c24e5da67d3f096eb3f5c73e760e641 (diff) | |
| parent | 09868ace97177fbeb7198a844113f47065102b1b (diff) | |
| download | qtlocation-16423f84f970d7dac644a4b041e3ebe2ac0f6e22.tar.gz | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/location/maps/maps.pri
Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48
Diffstat (limited to 'src/location/maps/maps.pri')
| -rw-r--r-- | src/location/maps/maps.pri | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/location/maps/maps.pri b/src/location/maps/maps.pri index c8e28bab..97b28b69 100644 --- a/src/location/maps/maps.pri +++ b/src/location/maps/maps.pri @@ -54,6 +54,10 @@ PRIVATE_HEADERS += \ maps/qgeotiledmapreply_p_p.h \ maps/qgeotilespec_p.h \ maps/qgeotilespec_p_p.h \ + maps/qgeorouteparser_p.h \ + maps/qgeorouteparser_p_p.h \ + maps/qgeorouteparserosrmv5_p.h \ + maps/qgeorouteparserosrmv4_p.h \ maps/qcache3q_p.h SOURCES += \ @@ -84,6 +88,8 @@ SOURCES += \ maps/qgeotiledmapreply.cpp \ maps/qgeotilespec.cpp \ maps/qgeotiledmap.cpp \ - maps/qgeotiledmapscene.cpp - + maps/qgeotiledmapscene.cpp \ + maps/qgeorouteparser.cpp \ + maps/qgeorouteparserosrmv5.cpp \ + maps/qgeorouteparserosrmv4.cpp |