Skip to content

Commit

Permalink
QgsProjUtils::searchPaths(): avoid potential bug for a future PROJ 7.1.0
Browse files Browse the repository at this point in the history
We can remove this test as PROJ >= 6.3.0 is now a requirement for the PROJ 6
code paths.
  • Loading branch information
rouault authored and nyalldawson committed Jan 30, 2020
1 parent d1b2d2f commit ed3e0d9
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/core/qgsprojutils.cpp
Expand Up @@ -315,15 +315,10 @@ QStringList QgsProjUtils::searchPaths()
#if PROJ_VERSION_MAJOR>=6
const QString path( proj_info().searchpath );
QStringList paths;
#if PROJ_VERSION_MINOR==1 && PROJ_VERSION_PATCH==0
// -- see https://github.com/OSGeo/proj.4/pull/1497
paths = path.split( ';' );
#else
#ifdef Q_OS_WIN
paths = path.split( ';' );
#else
paths = path.split( ':' );
#endif
#endif

QSet<QString> existing;
Expand Down

0 comments on commit ed3e0d9

Please sign in to comment.