[QGIS Commit] r10320 - trunk/qgis/src/helpviewer

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2009-03-20 10:30:18 -0400 (Fri, 20 Mar 2009)
New Revision: 10320

Modified:
   trunk/qgis/src/helpviewer/main.cpp
Log:
use configured QGIS_DATA_SUBDIR on OSX

Modified: trunk/qgis/src/helpviewer/main.cpp
===================================================================
--- trunk/qgis/src/helpviewer/main.cpp	2009-03-20 14:10:21 UTC (rev 10319)
+++ trunk/qgis/src/helpviewer/main.cpp	2009-03-20 14:30:18 UTC (rev 10320)
@@ -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 @@
   {
     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();