fix tests (followup 9c5d397)

qgis · Sep 24, 2018 · e2caf22 · e2caf22
1 parent 6ecb08c
commit e2caf22
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/core/qgsapplication.cpp b/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;
     }