diff --git a/.github/workflows/Linux-Test.yml b/.github/workflows/Linux-Test.yml index a4c1f48..6990ff4 100644 --- a/.github/workflows/Linux-Test.yml +++ b/.github/workflows/Linux-Test.yml @@ -48,6 +48,10 @@ jobs: qt_version: 6.5.3 qt_modules: qtlocation qtpositioning compiler: gcc-13 + - qt_series: 6 + qt_version: 6.6.0 + qt_modules: qtlocation qtpositioning + compiler: gcc-13 steps: - name: Checkout diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index d91680d..e773617 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -50,6 +50,9 @@ jobs: - qt_series: 6 qt_version: 6.5.3 qt_modules: qtlocation qtpositioning + - qt_series: 6 + qt_version: 6.6.0 + qt_modules: qtlocation qtpositioning steps: - name: Checkout @@ -103,7 +106,7 @@ jobs: contents: write strategy: matrix: - qt_version: [5.15.2, 6.5.3] + qt_version: [5.15.2, 6.5.3, 6.6.0] steps: - name: Download artifacts diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 2a37c61..3de61b5 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -52,6 +52,9 @@ jobs: - qt_series: 6 qt_version: 6.5.3 qt_modules: qtlocation qtpositioning + - qt_series: 6 + qt_version: 6.6.0 + qt_modules: qtlocation qtpositioning steps: - name: Checkout @@ -183,7 +186,7 @@ jobs: contents: write strategy: matrix: - qt_version: [5.15.2, 6.5.3] + qt_version: [5.15.2, 6.5.3, 6.6.0] steps: - name: Download artifacts diff --git a/src/location/stylechange.cpp b/src/location/stylechange.cpp index 36fdec6..b2a8dee 100644 --- a/src/location/stylechange.cpp +++ b/src/location/stylechange.cpp @@ -57,8 +57,8 @@ QMapLibre::Feature featureFromMapCircle(QDeclarativeCircleMapItem *mapItem) { path, mapItem->center(), mapItem->radius(), circleSamples, leftBound); #endif QList pathProjected; -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) - QDeclarativeCircleMapItemPrivate::calculatePeripheralPoints( +#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) + QDeclarativeCircleMapItemPrivate::calculatePeripheralPointsSimple( pathProjected, mapItem->center(), mapItem->radius(), p, circleSamples); // TODO: Removed for now. Update when the 6.6 API for this is fixed // if (QDeclarativeCircleMapItemPrivateCPU::crossEarthPole(mapItem->center(), mapItem->radius())) @@ -66,6 +66,11 @@ QMapLibre::Feature featureFromMapCircle(QDeclarativeCircleMapItem *mapItem) { // mapItem->radius(), p); QList path; for (const QDoubleVector2D &c : std::as_const(pathProjected)) path << p.mapProjectionToGeo(c); +#elif QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + QDeclarativeCircleMapItemPrivate::calculatePeripheralPoints( + pathProjected, mapItem->center(), mapItem->radius(), p, circleSamples); + QList path; + for (const QDoubleVector2D &c : std::as_const(pathProjected)) path << p.mapProjectionToGeo(c); #else for (const QGeoCoordinate &c : qAsConst(path)) pathProjected << p.geoToMapProjection(c); if (QDeclarativeCircleMapItemPrivateCPU::crossEarthPole(mapItem->center(), mapItem->radius()))