diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-03 09:10:19 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-03 09:10:24 +0100 |
| commit | 05c6863297249784b1775d78ccd831900b5c44c9 (patch) | |
| tree | 0d3a506ea8156e9b0dc1851b09bc1e74cfa5aa09 /src/imports/location/qgeomapitemgeometry.cpp | |
| parent | 2a894c5ff9b57f97f47672139db1955161055530 (diff) | |
| parent | 219e7b84ac048ff585c36f47a1c783af9ae4e4bc (diff) | |
| download | qtlocation-05c6863297249784b1775d78ccd831900b5c44c9.tar.gz | |
Merge remote-tracking branch 'gerrit/5.8' into dev
Change-Id: I3598004c8d947f42c499137c7767cfcb91643082
Diffstat (limited to 'src/imports/location/qgeomapitemgeometry.cpp')
| -rw-r--r-- | src/imports/location/qgeomapitemgeometry.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/location/qgeomapitemgeometry.cpp b/src/imports/location/qgeomapitemgeometry.cpp index 513feb2a..c8168f67 100644 --- a/src/imports/location/qgeomapitemgeometry.cpp +++ b/src/imports/location/qgeomapitemgeometry.cpp @@ -70,11 +70,11 @@ void QGeoMapItemGeometry::allocateAndFill(QSGGeometry *geom) const if (isIndexed()) { geom->allocate(vx.size(), ix.size()); - if (geom->indexType() == QSGGeometry::TypeUnsignedShort) { + if (geom->indexType() == QSGGeometry::UnsignedShortType) { quint16 *its = geom->indexDataAsUShort(); for (int i = 0; i < ix.size(); ++i) its[i] = ix[i]; - } else if (geom->indexType() == QSGGeometry::TypeUnsignedInt) { + } else if (geom->indexType() == QSGGeometry::UnsignedIntType) { quint32 *its = geom->indexDataAsUInt(); for (int i = 0; i < ix.size(); ++i) its[i] = ix[i]; |