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

m-kuhn · m-kuhn · commit d64ee565569f · 2013-05-15T17:04:05.000+02:00
This reverts commit 30b9fed. qgis_help doesn't need to know the install path any more, because it reads from stdin instead of directly opening files
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" << "/../../.." << "/../../bin" )
+  foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
   {
     f.setFileName( prefixPath + path + "/path.txt" );
     if ( f.exists() )
@@ -323,12 +323,10 @@ const QString QgsApplication::pluginPath()
 {
   return ABISYM( mPluginPath );
 }
-
 const QString QgsApplication::pkgDataPath()
 {
   return ABISYM( mPkgDataPath );
 }
-
 const QString QgsApplication::defaultThemePath()
 {
   return ":/images/themes/default/";

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void QgsApplication::init( QString customConfigPath )`
`94`	`94`	`// check if QGIS is run from build directory (not the install directory)`
`95`	`95`	`QFile f;`
`96`	`96`	`// "/../../.." is for Mac bundled app in build directory`
`97`		`- foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." << "/../../bin" )`
	`97`	`+ foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." )`
`98`	`98`	`{`
`99`	`99`	`f.setFileName( prefixPath + path + "/path.txt" );`
`100`	`100`	`if ( f.exists() )`
`@@ -323,12 +323,10 @@ const QString QgsApplication::pluginPath()`
`323`	`323`	`{`
`324`	`324`	`return ABISYM( mPluginPath );`
`325`	`325`	`}`
`326`		`-`
`327`	`326`	`const QString QgsApplication::pkgDataPath()`
`328`	`327`	`{`
`329`	`328`	`return ABISYM( mPkgDataPath );`
`330`	`329`	`}`
`331`		`-`
`332`	`330`	`const QString QgsApplication::defaultThemePath()`
`333`	`331`	`{`
`334`	`332`	`return ":/images/themes/default/";`