Lets try fix this

NathanW2 · NathanW2 · commit 3b6d37fee0f8 · 2018-02-12T15:17:17.000+10:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -798,6 +798,7 @@ int main( int argc, char *argv[] )
   QCoreApplication::setAttribute( Qt::AA_DisableWindowContextHelpButton, true );
 #endif
 
+  QApplication *subapp = new QApplication(argc, argv);
   // SetUp the QgsSettings Global Settings:
   // - use the path specified with --globalsettingsfile path,
   // - use the environment if not found
@@ -809,7 +810,8 @@ int main( int argc, char *argv[] )
 
   if ( globalsettingsfile.isEmpty() )
   {
-    QString default_globalsettingsfile = QgsApplication::pkgDataPath() + "/qgis_global_settings.ini";
+    QString default_globalsettingsfile = QgsApplication::resolvePkgPath() + "/resources/qgis_global_settings.ini";
+    QgsDebugMsg( "GLOABL SETTINGS FILE:" + default_globalsettingsfile );
     if ( QFile::exists( default_globalsettingsfile ) )
     {
       globalsettingsfile = default_globalsettingsfile;
@@ -849,6 +851,9 @@ int main( int argc, char *argv[] )
     }
   }
   delete globalSettings;
+  delete subapp;
+
+  QgsDebugMsg( "CONFIG LOCAL STORAGE:" + configLocalStorageLocation );
 
   QString rootProfileFolder = QgsUserProfileManager::resolveProfilesFolder( configLocalStorageLocation );
   QgsUserProfileManager manager( rootProfileFolder );
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -577,6 +577,36 @@ void QgsApplication::setThemeName( const QString &themeName )
   ABISYM( mThemeName ) = themeName;
 }
 
+QString QgsApplication::resolvePkgPath()
+{
+#if defined(ANDROID)
+  QString prefixPath( getenv( "QGIS_PREFIX_PATH" ) ? getenv( "QGIS_PREFIX_PATH" ) : QDir::homePath() );
+#else
+  QString prefixPath( getenv( "QGIS_PREFIX_PATH" ) ? getenv( "QGIS_PREFIX_PATH" ) : applicationDirPath() );
+#endif
+  QFile f;
+  // "/../../.." is for Mac bundled app in build directory
+  Q_FOREACH ( const QString &path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
+  {
+    f.setFileName( prefixPath + path + "/qgisbuildpath.txt" );
+    QgsDebugMsg(f.fileName());
+    if ( f.exists() )
+      break;
+  }
+
+  if ( f.exists() && f.open( QIODevice::ReadOnly ) )
+  {
+    return f.readLine().trimmed();
+    QgsDebugMsg("Running from build dir!");
+    return buildSourcePath;
+  }
+  else
+  {
+    return prefixPath + '/' + QStringLiteral( QGIS_DATA_SUBDIR );
+  }
+
+}
+
 QString QgsApplication::themeName()
 {
   return ABISYM( mThemeName );
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -184,6 +184,8 @@ class CORE_EXPORT QgsApplication : public QApplication
      */
     static void setThemeName( const QString &themeName );
 
+    static QString resolvePkgPath( );
+
     /**
      * Set the active theme to the specified theme.
      * The theme name should be a single word e.g. 'default','classic'.

Original file line number	Diff line number	Diff line change
`@@ -798,6 +798,7 @@ int main( int argc, char *argv[] )`
`798`	`798`	`QCoreApplication::setAttribute( Qt::AA_DisableWindowContextHelpButton, true );`
`799`	`799`	`#endif`
`800`	`800`
	`801`	`+ QApplication *subapp = new QApplication(argc, argv);`
`801`	`802`	`// SetUp the QgsSettings Global Settings:`
`802`	`803`	`// - use the path specified with --globalsettingsfile path,`
`803`	`804`	`// - use the environment if not found`
`@@ -809,7 +810,8 @@ int main( int argc, char *argv[] )`
`809`	`810`
`810`	`811`	`if ( globalsettingsfile.isEmpty() )`
`811`	`812`	`{`
`812`		`- QString default_globalsettingsfile = QgsApplication::pkgDataPath() + "/qgis_global_settings.ini";`
	`813`	`+ QString default_globalsettingsfile = QgsApplication::resolvePkgPath() + "/resources/qgis_global_settings.ini";`
	`814`	`+ QgsDebugMsg( "GLOABL SETTINGS FILE:" + default_globalsettingsfile );`
`813`	`815`	`if ( QFile::exists( default_globalsettingsfile ) )`
`814`	`816`	`{`
`815`	`817`	`globalsettingsfile = default_globalsettingsfile;`
`@@ -849,6 +851,9 @@ int main( int argc, char *argv[] )`
`849`	`851`	`}`
`850`	`852`	`}`
`851`	`853`	`delete globalSettings;`
	`854`	`+ delete subapp;`
	`855`	`+`
	`856`	`+ QgsDebugMsg( "CONFIG LOCAL STORAGE:" + configLocalStorageLocation );`
`852`	`857`
`853`	`858`	`QString rootProfileFolder = QgsUserProfileManager::resolveProfilesFolder( configLocalStorageLocation );`
`854`	`859`	`QgsUserProfileManager manager( rootProfileFolder );`