From 7105b4b1b298bfc18238ebeba4407b42189de5b5 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 18 Dec 2019 15:51:43 +1000 Subject: [PATCH] Fix build on proj <6 (cherry picked from commit 6490a170b18202808d462f62fe2e3d95c862b81e) --- src/core/qgsprojutils.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/qgsprojutils.h b/src/core/qgsprojutils.h index 1230280a3691..333a1eb9b38f 100644 --- a/src/core/qgsprojutils.h +++ b/src/core/qgsprojutils.h @@ -63,6 +63,14 @@ class CORE_EXPORT QgsProjUtils static QStringList searchPaths(); #ifndef SIP_RUN + + //! Flags controlling CRS identification behavior + enum IdentifyFlag + { + FlagMatchBoundCrsToUnderlyingSourceCrs = 1 << 0, //!< Allow matching a BoundCRS object to its underlying SourceCRS + }; + Q_DECLARE_FLAGS( IdentifyFlags, IdentifyFlag ) + #if PROJ_VERSION_MAJOR >= 6 /** @@ -103,13 +111,6 @@ class CORE_EXPORT QgsProjUtils */ static proj_pj_unique_ptr crsToSingleCrs( const PJ *crs ); - //! Flags controlling CRS identification behavior - enum IdentifyFlag - { - FlagMatchBoundCrsToUnderlyingSourceCrs = 1 << 0, //!< Allow matching a BoundCRS object to its underlying SourceCRS - }; - Q_DECLARE_FLAGS( IdentifyFlags, IdentifyFlag ) - /** * Attempts to identify a \a crs, matching it to a known authority and code within * an acceptable level of tolerance.