[qgis_help] Detect proper resource path when running from build dir

qgis · May 13, 2013 · 30b9fed · 30b9fed
1 parent 27183d9
commit 30b9fed
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -94,7 +94,7 @@ void QgsApplication::init( QString customConfigPath )
   // check if QGIS is run from build directory (not the install directory)
   QFile f;
   // "/../../.." is for Mac bundled app in build directory
-  foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
+  foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." << "/../../bin" )
   {
     f.setFileName( prefixPath + path + "/path.txt" );
     if ( f.exists() )
@@ -319,10 +319,12 @@ const QString QgsApplication::pluginPath()
 {
   return ABISYM( mPluginPath );
 }
+
 const QString QgsApplication::pkgDataPath()
 {
   return ABISYM( mPkgDataPath );
 }
+
 const QString QgsApplication::defaultThemePath()
 {
   return ":/images/themes/default/";