Skip to content
Permalink
Browse files

fix tests (followup 9c5d397)

  • Loading branch information
jef-n committed Sep 24, 2018
1 parent 6ecb08c commit e2caf2209aa227e5411572ceab9103f8e387a582
Showing with 6 additions and 1 deletion.
  1. +6 −1 src/core/qgsapplication.cpp
@@ -645,13 +645,18 @@ QString QgsApplication::resolvePkgPath()
{
qWarning( "Application path not initialized" );
}
}

if ( !appPath.isNull() || getenv( "QGIS_PREFIX_PATH" ) )
{
QString prefix = getenv( "QGIS_PREFIX_PATH" ) ? getenv( "QGIS_PREFIX_PATH" ) : appPath;

// check if QGIS is run from build directory (not the install directory)
QFile f;
// "/../../.." is for Mac bundled app in build directory
Q_FOREACH ( const QString &path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
{
f.setFileName( appPath + path + "/qgisbuildpath.txt" );
f.setFileName( prefix + path + "/qgisbuildpath.txt" );
if ( f.exists() )
break;
}

0 comments on commit e2caf22

Please sign in to comment.
You can’t perform that action at this time.