use configured QGIS_DATA_SUBDIR on OSX

kyngchaos · kyngchaos · commit 87469544ee23 · 2009-03-20T14:30:18.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10320 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -22,6 +22,7 @@
 #include "qgshelpviewer.h"
 #include "qgsapplication.h"
 #include "qgslogger.h"
+#include "qgsconfig.h"
 
 int main( int argc, char ** argv )
 {
@@ -39,9 +40,9 @@ int main( int argc, char ** argv )
   {
     context = argv[1];
   }
-#ifdef Q_WS_MAC
+#ifdef Q_WS_MACX
   // If we're on Mac, we have the resource library way above us...
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../share/qgis" );
+  a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
 #endif
 
   QString i18nPath = QgsApplication::i18nPath();

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include "qgshelpviewer.h"`
`23`	`23`	`#include "qgsapplication.h"`
`24`	`24`	`#include "qgslogger.h"`
	`25`	`+#include "qgsconfig.h"`
`25`	`26`
`26`	`27`	`int main( int argc, char ** argv )`
`27`	`28`	`{`
`@@ -39,9 +40,9 @@ int main( int argc, char ** argv )`
`39`	`40`	`{`
`40`	`41`	`context = argv[1];`
`41`	`42`	`}`
`42`		`-#ifdef Q_WS_MAC`
	`43`	`+#ifdef Q_WS_MACX`
`43`	`44`	`// If we're on Mac, we have the resource library way above us...`
`44`		`- a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../share/qgis" );`
	`45`	`+ a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );`
`45`	`46`	`#endif`
`46`	`47`
`47`	`48`	`QString i18nPath = QgsApplication::i18nPath();`