Skip to content

Commit

Permalink
Revert "[qgis_help] Detect proper resource path when running from bui…
Browse files Browse the repository at this point in the history
…ld dir"

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
  • Loading branch information
m-kuhn committed May 15, 2013
1 parent 8f363b5 commit d64ee56
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/core/qgsapplication.cpp
Expand Up @@ -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() )
Expand Down Expand Up @@ -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/";
Expand Down

0 comments on commit d64ee56

Please sign in to comment.