sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adapt PROJ search path handling for Proj 6.1.1

Browse Source
This commit is contained in:
Nyall Dawson 2019-06-25 20:24:20 +10:00
parent 512642db18
commit 4a2adfc3df
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/qgsprojutils.cpp
View File

@ -257,11 +257,15 @@ QStringList QgsProjUtils::searchPaths()
#if PROJ_VERSION_MAJOR >= 6 #if PROJ_VERSION_MAJOR >= 6
const QString path( proj_info().searchpath ); const QString path( proj_info().searchpath );
QStringList paths; QStringList paths;
// #ifdef Q_OS_WIN #if PROJ_VERSION_MINOR == 1 and PROJ_VERSION_PATCH == 0
#if 1 // -- see https://github.com/OSGeo/proj.4/pull/1497 // -- see https://github.com/OSGeo/proj.4/pull/1497
paths = path.split( ';' );
#else
#ifdef Q_OS_WIN
paths = path.split( ';' ); paths = path.split( ';' );
#else #else
paths = path.split( ':' ); paths = path.split( ':' );
#endif
#endif #endif
QSet<QString> existing; QSet<QString> existing;